From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 9 Feb 2020 22:32:24 +0000 (+0100)
Subject: fix up bonding patch for older kernels
X-Git-Tag: v4.19.103~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa38df5760a68ca78190c5572391dab599d9bcd9;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up bonding patch for older kernels
---

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 <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  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 <gregkh@linuxfoundation.org>
  	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 <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  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 <gregkh@linuxfoundation.org>
  	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 <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  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 <gregkh@linuxfoundation.org>
  	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;