diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-04-14 12:17:20 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-14 12:17:20 +0000 |
commit | 054044ff91891723025a6b35bd583c98e141ea3d (patch) | |
tree | a3f4744223e4a3ac72ac691f8690cf0cc57cf1c7 /target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch | |
parent | 023d3337d828ba911cc8713839e18afd6b7da244 (diff) | |
download | master-187ad058-054044ff91891723025a6b35bd583c98e141ea3d.tar.gz master-187ad058-054044ff91891723025a6b35bd583c98e141ea3d.tar.bz2 master-187ad058-054044ff91891723025a6b35bd583c98e141ea3d.zip |
kernel: update bgmac patches to the latest version submitted
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45431 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch b/target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch index e7fde163fd..2c490efbbb 100644 --- a/target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch +++ b/target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -342,13 +342,13 @@ static int bgmac_dma_rx_skb_for_slot(str +@@ -346,13 +346,13 @@ static int bgmac_dma_rx_skb_for_slot(str return -ENOMEM; /* Poison - if everything goes fine, hardware will overwrite it */ @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (dma_mapping_error(dma_dev, dma_addr)) { bgmac_err(bgmac, "DMA mapping error\n"); put_page(virt_to_head_page(buf)); -@@ -399,7 +399,7 @@ static int bgmac_dma_rx_read(struct bgma +@@ -403,7 +403,7 @@ static int bgmac_dma_rx_read(struct bgma while (ring->start != ring->end) { struct device *dma_dev = bgmac->core->dma_dev; struct bgmac_slot_info *slot = &ring->slots[ring->start]; @@ -36,7 +36,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> struct sk_buff *skb; void *buf = slot->buf; u16 len, flags; -@@ -450,8 +450,10 @@ static int bgmac_dma_rx_read(struct bgma +@@ -454,8 +454,10 @@ static int bgmac_dma_rx_read(struct bgma BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE); skb = build_skb(buf, BGMAC_RX_ALLOC_SIZE); |