From fad62fe83386ed9be0c9d7dcd4740123171aa326 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 9 Jul 2012 14:09:33 +0000 Subject: [PATCH] --- yaml --- r: 315097 b: refs/heads/master c: 8505120e5af625ab463a603228a3afbdd283ac31 h: refs/heads/master i: 315095: 2406b2bba78a7a1f80cf45a82368a3bff1980a44 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sun/sungem.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a91b4039902..50be77c1aa0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb716c54b1c71ad28ab20461bff831bd481066c4 +refs/heads/master: 8505120e5af625ab463a603228a3afbdd283ac31 diff --git a/trunk/drivers/net/ethernet/sun/sungem.c b/trunk/drivers/net/ethernet/sun/sungem.c index 3cf4ab755838..9ae12d0c9632 100644 --- a/trunk/drivers/net/ethernet/sun/sungem.c +++ b/trunk/drivers/net/ethernet/sun/sungem.c @@ -752,7 +752,6 @@ static __inline__ struct sk_buff *gem_alloc_skb(struct net_device *dev, int size if (likely(skb)) { unsigned long offset = ALIGNED_RX_SKB_ADDR(skb->data); skb_reserve(skb, offset); - skb->dev = dev; } return skb; }