Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -1489,8 +1489,6 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev,
|
||||
goto drop;
|
||||
|
||||
/* Queue packet (standard) */
|
||||
skb->sk = sock;
|
||||
|
||||
if (sock_queue_rcv_skb(sock, skb) < 0)
|
||||
goto drop;
|
||||
|
||||
@@ -1644,7 +1642,6 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
|
||||
if (!skb)
|
||||
goto out;
|
||||
|
||||
skb->sk = sk;
|
||||
skb_reserve(skb, ddp_dl->header_length);
|
||||
skb_reserve(skb, dev->hard_header_len);
|
||||
skb->dev = dev;
|
||||
|
Reference in New Issue
Block a user