diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /drivers/net/qlcnic | |
| parent | 42099d7a3941d4aaf853caac92b3ae76149fc6e7 (diff) | |
| parent | 2cc6d2bf3d6195fabcf0febc192c01f99519a8f3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'drivers/net/qlcnic')
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c index 16dd9ebd36c9..5c33d15c874a 100644 --- a/drivers/net/qlcnic/qlcnic_init.c +++ b/drivers/net/qlcnic/qlcnic_init.c | |||
| @@ -1303,7 +1303,7 @@ qlcnic_alloc_rx_skb(struct qlcnic_adapter *adapter, | |||
| 1303 | return -ENOMEM; | 1303 | return -ENOMEM; |
| 1304 | } | 1304 | } |
| 1305 | 1305 | ||
| 1306 | skb_reserve(skb, 2); | 1306 | skb_reserve(skb, NET_IP_ALIGN); |
| 1307 | 1307 | ||
| 1308 | dma = pci_map_single(pdev, skb->data, | 1308 | dma = pci_map_single(pdev, skb->data, |
| 1309 | rds_ring->dma_size, PCI_DMA_FROMDEVICE); | 1309 | rds_ring->dma_size, PCI_DMA_FROMDEVICE); |