aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-11-24 10:01:18 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-11-24 10:01:18 +0000
commit404b68fcd2ce817d0a866c786b93fe4b34289f00 (patch)
tree17298cf12d7c49f832bb0cb9142c41d1e5f3cb45
parent00bd3f47c481d4568792c3a09ba2197f1f4b230a (diff)
downloadmaster-187ad058-404b68fcd2ce817d0a866c786b93fe4b34289f00.tar.gz
master-187ad058-404b68fcd2ce817d0a866c786b93fe4b34289f00.tar.bz2
master-187ad058-404b68fcd2ce817d0a866c786b93fe4b34289f00.zip
ramips: Use NET_IP_ALIGN instead of hardcoding 2
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24124 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ramips/files/drivers/net/ramips.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c
index 1f3c35aa9d..812507328f 100644
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -169,12 +169,13 @@ ramips_alloc_dma(struct raeth_priv *re)
memset(re->rx, 0, sizeof(struct ramips_rx_dma) * NUM_RX_DESC);
for (i = 0; i < NUM_RX_DESC; i++) {
- struct sk_buff *new_skb = dev_alloc_skb(MAX_RX_LENGTH + 2);
+ struct sk_buff *new_skb = dev_alloc_skb(MAX_RX_LENGTH +
+ NET_IP_ALIGN);
if (!new_skb)
goto err_cleanup;
- skb_reserve(new_skb, 2);
+ skb_reserve(new_skb, NET_IP_ALIGN);
re->rx[i].rxd1 = dma_map_single(NULL,
new_skb->data,
MAX_RX_LENGTH,
@@ -272,7 +273,7 @@ ramips_eth_rx_hw(unsigned long ptr)
break;
max_rx--;
- new_skb = netdev_alloc_skb(dev, MAX_RX_LENGTH + 2);
+ new_skb = netdev_alloc_skb(dev, MAX_RX_LENGTH + NET_IP_ALIGN);
/* Reuse the buffer on allocation failures */
if (new_skb) {
rx_skb = priv->rx_skb[rx];
@@ -285,7 +286,7 @@ ramips_eth_rx_hw(unsigned long ptr)
netif_rx(rx_skb);
priv->rx_skb[rx] = new_skb;
- skb_reserve(new_skb, 2);
+ skb_reserve(new_skb, NET_IP_ALIGN);
priv->rx[rx].rxd1 = dma_map_single(NULL,
new_skb->data,
MAX_RX_LENGTH,