diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/sgiseeq.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/sgiseeq.c')
| -rw-r--r-- | drivers/net/sgiseeq.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c index f4dfd1f679a9..6b364a6c6c60 100644 --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c | |||
| @@ -365,11 +365,10 @@ static inline void sgiseeq_rx(struct net_device *dev, struct sgiseeq_private *sp | |||
| 365 | } | 365 | } |
| 366 | skb_reserve(newskb, 2); | 366 | skb_reserve(newskb, 2); |
| 367 | } else { | 367 | } else { |
| 368 | skb = netdev_alloc_skb(dev, len + 2); | 368 | skb = netdev_alloc_skb_ip_align(dev, len); |
| 369 | if (skb) { | 369 | if (skb) |
| 370 | skb_reserve(skb, 2); | ||
| 371 | skb_copy_to_linear_data(skb, rd->skb->data, len); | 370 | skb_copy_to_linear_data(skb, rd->skb->data, len); |
| 372 | } | 371 | |
| 373 | newskb = rd->skb; | 372 | newskb = rd->skb; |
| 374 | } | 373 | } |
| 375 | memory_squeeze: | 374 | memory_squeeze: |