X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fllc%2Fllc_sap.c;fp=net%2Fllc%2Fllc_sap.c;h=4029ceee9b9168d2f7b09e1eb1d64316f8544234;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=61cb8cf7d1532a4d4b1abd51244e863fc7e8b887;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 61cb8cf7d..4029ceee9 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -51,10 +51,10 @@ void llc_save_primitive(struct sock *sk, struct sk_buff* skb, u8 prim)
 {
 	struct sockaddr_llc *addr;
 
+	if (skb->sk->sk_type == SOCK_STREAM) /* See UNIX98 */
+		return;
        /* save primitive for use by the user. */
 	addr		  = llc_ui_skb_cb(skb);
-
-	memset(addr, 0, sizeof(*addr));
 	addr->sllc_family = sk->sk_family;
 	addr->sllc_arphrd = skb->dev->type;
 	addr->sllc_test   = prim == LLC_TEST_PRIM;
@@ -282,7 +282,7 @@ static void llc_sap_rcv(struct llc_sap *sap, struct sk_buff *skb)
  *	mac, and local sap. Returns pointer for socket found, %NULL otherwise.
  */
 static struct sock *llc_lookup_dgram(struct llc_sap *sap,
-				     const struct llc_addr *laddr)
+				     struct llc_addr *laddr)
 {
 	struct sock *rc;
 	struct hlist_node *node;
@@ -304,65 +304,19 @@ found:
 	return rc;
 }
 
-/**
- * 	llc_sap_mcast - Deliver multicast PDU's to all matching datagram sockets.
- *	@sap: SAP
- *	@laddr: address of local LLC (MAC + SAP)
- *
- *	Search socket list of the SAP and finds connections with same sap.
- *	Deliver clone to each.
- */
-static void llc_sap_mcast(struct llc_sap *sap,
-			  const struct llc_addr *laddr,
-			  struct sk_buff *skb)
-{
-	struct sock *sk;
-	struct hlist_node *node;
-
-	read_lock_bh(&sap->sk_list.lock);
-	sk_for_each(sk, node, &sap->sk_list.list) {
-		struct llc_sock *llc = llc_sk(sk);
-		struct sk_buff *skb1;
-
-		if (sk->sk_type != SOCK_DGRAM)
-			continue;
-
-		if (llc->laddr.lsap != laddr->lsap)
-			continue;
-
-		if (llc->dev != skb->dev)
-			continue;
-
-		skb1 = skb_clone(skb, GFP_ATOMIC);
-		if (!skb1)
-			break;
-
-		sock_hold(sk);
-		skb_set_owner_r(skb1, sk);
-		llc_sap_rcv(sap, skb1);
-		sock_put(sk);
-	}
-	read_unlock_bh(&sap->sk_list.lock);
-}
-
-
 void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb)
 {
 	struct llc_addr laddr;
+	struct sock *sk;
 
 	llc_pdu_decode_da(skb, laddr.mac);
 	llc_pdu_decode_dsap(skb, &laddr.lsap);
 
-	if (llc_mac_multicast(laddr.mac)) {
-		llc_sap_mcast(sap, &laddr, skb);
+	sk = llc_lookup_dgram(sap, &laddr);
+	if (sk) {
+		skb_set_owner_r(skb, sk);
+		llc_sap_rcv(sap, skb);
+		sock_put(sk);
+	} else
 		kfree_skb(skb);
-	} else {
-		struct sock *sk = llc_lookup_dgram(sap, &laddr);
-		if (sk) {
-			skb_set_owner_r(skb, sk);
-			llc_sap_rcv(sap, skb);
-			sock_put(sk);
-		} else
-			kfree_skb(skb);
-	}
 }