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 c96b2cab5a87ff2b9ab73dfc8842cb162fcd600c..db99c871b5187461ed63a0908b011b4dddfc2028 100644 (file)
--- 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 34ecd16d6ac2be49a5d6dd8dc26ce887f0326662..d28f1aacfcc6b8bef5bf0159772288726ac159f1 100644 (file)
--- 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 34ecd16d6ac2be49a5d6dd8dc26ce887f0326662..d28f1aacfcc6b8bef5bf0159772288726ac159f1 100644 (file)
--- 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;