diff options
| author | Petr Štetiar <ynezz@true.cz> | 2021-12-23 11:37:55 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2021-12-29 08:52:36 +0100 |
| commit | 81d0b4a9f431b2b2ca71edca91febedde98994a3 (patch) | |
| tree | 1ba3dcc529a31e52f22f56291e849fd845e9d3e3 /target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch | |
| parent | 1d94f72439034c112bfa4b694fc736123f4890a5 (diff) | |
| download | openwrt-81d0b4a9f431b2b2ca71edca91febedde98994a3.tar.gz openwrt-81d0b4a9f431b2b2ca71edca91febedde98994a3.tar.bz2 openwrt-81d0b4a9f431b2b2ca71edca91febedde98994a3.zip | |
kernel: bump 4.14 to 4.14.259
All patches refreshed automagically without conflicts, but upstream in
commit 48c2461f28fe ("ARM: 8800/1: use choice for kernel unwinders")
added new config options UNWINDER_ARM and UNWINDER_FRAME_POINTER so we
need to adjust default configs as well.
Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch b/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch index ece8542c01..518ff32d14 100644 --- a/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch +++ b/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch @@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> #define TX_OVERHEAD (8) #define RXW_PADDING 2 -@@ -2285,6 +2286,11 @@ static int lan78xx_set_features(struct n +@@ -2283,6 +2284,11 @@ static int lan78xx_set_features(struct n pdata->rfe_ctl &= ~(RFE_CTL_ICMP_COE_ | RFE_CTL_IGMP_COE_); } @@ -36,7 +36,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> if (features & NETIF_F_HW_VLAN_CTAG_FILTER) pdata->rfe_ctl |= RFE_CTL_VLAN_FILTER_; else -@@ -2834,6 +2840,9 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2832,6 +2838,9 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_TSO_CSUM_ENABLE) dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG; @@ -46,7 +46,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> if (DEFAULT_VLAN_FILTER_ENABLE) dev->net->features |= NETIF_F_HW_VLAN_CTAG_FILTER; -@@ -2914,6 +2923,16 @@ static void lan78xx_rx_csum_offload(stru +@@ -2912,6 +2921,16 @@ static void lan78xx_rx_csum_offload(stru } } @@ -63,7 +63,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> static void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb) { int status; -@@ -2978,6 +2997,8 @@ static int lan78xx_rx(struct lan78xx_net +@@ -2976,6 +2995,8 @@ static int lan78xx_rx(struct lan78xx_net if (skb->len == size) { lan78xx_rx_csum_offload(dev, skb, rx_cmd_a, rx_cmd_b); @@ -72,7 +72,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> skb_trim(skb, skb->len - 4); /* remove fcs */ skb->truesize = size + sizeof(struct sk_buff); -@@ -2996,6 +3017,7 @@ static int lan78xx_rx(struct lan78xx_net +@@ -2994,6 +3015,7 @@ static int lan78xx_rx(struct lan78xx_net skb_set_tail_pointer(skb2, size); lan78xx_rx_csum_offload(dev, skb2, rx_cmd_a, rx_cmd_b); |