diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-09 11:49:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-09 11:49:13 -0700 |
| commit | a4657141091c2f975fa35ac1ad28fffdd756091e (patch) | |
| tree | d284f416d2ffb21d5cb3a74843a9ab976ec32193 /net/core/skbuff.c | |
| parent | 54f58d6c4f15f3bdf15d43fa640ca6de9487f50e (diff) | |
| parent | 7c91767a6b701543c93ebcd611dab61deff3dad1 (diff) | |
| download | op-kernel-dev-a4657141091c2f975fa35ac1ad28fffdd756091e.zip op-kernel-dev-a4657141091c2f975fa35ac1ad28fffdd756091e.tar.gz | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 022d889..c54f366 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -268,8 +268,10 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, struct sk_buff *skb; skb = alloc_skb(length + NET_SKB_PAD, gfp_mask); - if (likely(skb)) + if (likely(skb)) { skb_reserve(skb, NET_SKB_PAD); + skb->dev = dev; + } return skb; } |
