From aa38df5760a68ca78190c5572391dab599d9bcd9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 9 Feb 2020 23:32:24 +0100 Subject: [PATCH] fix up bonding patch for older kernels --- ...operly-access-headers-in-bond_alb_xmit.patch | 17 +---------------- ...operly-access-headers-in-bond_alb_xmit.patch | 17 +---------------- ...operly-access-headers-in-bond_alb_xmit.patch | 17 +---------------- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/queue-4.14/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch b/queue-4.14/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch index c96b2cab5a8..db99c871b51 100644 --- a/queue-4.14/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch +++ b/queue-4.14/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch @@ -60,8 +60,7 @@ Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/bonding/bond_alb.c | 44 +++++++++++++++++++++++++++++------------ - include/net/ipx.h | 5 ---- - 2 files changed, 32 insertions(+), 17 deletions(-) + 1 file changed, 32 insertions(+), 12 deletions(-) --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -160,17 +159,3 @@ Signed-off-by: Greg Kroah-Hartman case ETH_P_ARP: do_tx_balance = false; if (bond_info->rlb_enabled) ---- a/include/net/ipx.h -+++ b/include/net/ipx.h -@@ -47,11 +47,6 @@ struct ipxhdr { - /* From af_ipx.c */ - extern int sysctl_ipx_pprop_broadcasting; - --static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb) --{ -- return (struct ipxhdr *)skb_transport_header(skb); --} -- - struct ipx_interface { - /* IPX address */ - __be32 if_netnum; diff --git a/queue-4.4/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch b/queue-4.4/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch index 34ecd16d6ac..d28f1aacfcc 100644 --- a/queue-4.4/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch +++ b/queue-4.4/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch @@ -60,8 +60,7 @@ Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/bonding/bond_alb.c | 44 +++++++++++++++++++++++++++++------------ - include/net/ipx.h | 5 ---- - 2 files changed, 32 insertions(+), 17 deletions(-) + 1 file changed, 32 insertions(+), 12 deletions(-) --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -160,17 +159,3 @@ Signed-off-by: Greg Kroah-Hartman case ETH_P_ARP: do_tx_balance = false; if (bond_info->rlb_enabled) ---- a/include/net/ipx.h -+++ b/include/net/ipx.h -@@ -45,11 +45,6 @@ struct ipxhdr { - /* From af_ipx.c */ - extern int sysctl_ipx_pprop_broadcasting; - --static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb) --{ -- return (struct ipxhdr *)skb_transport_header(skb); --} -- - struct ipx_interface { - /* IPX address */ - __be32 if_netnum; diff --git a/queue-4.9/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch b/queue-4.9/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch index 34ecd16d6ac..d28f1aacfcc 100644 --- a/queue-4.9/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch +++ b/queue-4.9/bonding-alb-properly-access-headers-in-bond_alb_xmit.patch @@ -60,8 +60,7 @@ Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/bonding/bond_alb.c | 44 +++++++++++++++++++++++++++++------------ - include/net/ipx.h | 5 ---- - 2 files changed, 32 insertions(+), 17 deletions(-) + 1 file changed, 32 insertions(+), 12 deletions(-) --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -160,17 +159,3 @@ Signed-off-by: Greg Kroah-Hartman case ETH_P_ARP: do_tx_balance = false; if (bond_info->rlb_enabled) ---- a/include/net/ipx.h -+++ b/include/net/ipx.h -@@ -45,11 +45,6 @@ struct ipxhdr { - /* From af_ipx.c */ - extern int sysctl_ipx_pprop_broadcasting; - --static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb) --{ -- return (struct ipxhdr *)skb_transport_header(skb); --} -- - struct ipx_interface { - /* IPX address */ - __be32 if_netnum; -- 2.47.3