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 | 5c9c6706165d3ce7276eed2c557089aa690c6529 (patch) | |
| tree | a2dd8347d61e31d94dd0bd801720d6001983b43d /target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch | |
| parent | cd4fd05648194a252a560876742acab461f4ec8e (diff) | |
| download | upstream-5c9c6706165d3ce7276eed2c557089aa690c6529.tar.gz upstream-5c9c6706165d3ce7276eed2c557089aa690c6529.tar.bz2 upstream-5c9c6706165d3ce7276eed2c557089aa690c6529.zip | |
kernel: update bgmac patches to the latest version submitted
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45431
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); |