Commit 1ef8019b authored by David S. Miller's avatar David S. Miller

net: Move bonding headers under include/net

This ways drivers like cxgb4 don't need to do ugly relative includes.
Reported-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4483589f
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include <linux/if_bonding.h> #include <linux/if_bonding.h>
#include <linux/pkt_sched.h> #include <linux/pkt_sched.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include "bonding.h" #include <net/bonding.h>
#include "bond_3ad.h" #include <net/bond_3ad.h>
/* General definitions */ /* General definitions */
#define AD_SHORT_TIMEOUT 1 #define AD_SHORT_TIMEOUT 1
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#include <net/arp.h> #include <net/arp.h>
#include <net/ipv6.h> #include <net/ipv6.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include "bonding.h" #include <net/bonding.h>
#include "bond_alb.h" #include <net/bond_alb.h>
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include "bonding.h" #include <net/bonding.h>
#include "bond_alb.h" #include <net/bond_alb.h>
#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_NET_NS) #if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_NET_NS)
......
...@@ -77,9 +77,9 @@ ...@@ -77,9 +77,9 @@
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
#include <linux/rculist.h> #include <linux/rculist.h>
#include <net/flow_keys.h> #include <net/flow_keys.h>
#include "bonding.h" #include <net/bonding.h>
#include "bond_3ad.h" #include <net/bond_3ad.h>
#include "bond_alb.h" #include <net/bond_alb.h>
/*---------------------------- Module parameters ----------------------------*/ /*---------------------------- Module parameters ----------------------------*/
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <net/rtnetlink.h> #include <net/rtnetlink.h>
#include "bonding.h" #include <net/bonding.h>
static size_t bond_get_slave_size(const struct net_device *bond_dev, static size_t bond_get_slave_size(const struct net_device *bond_dev,
const struct net_device *slave_dev) const struct net_device *slave_dev)
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/inet.h> #include <linux/inet.h>
#include "bonding.h" #include <net/bonding.h>
static int bond_option_active_slave_set(struct bonding *bond, static int bond_option_active_slave_set(struct bonding *bond,
const struct bond_opt_value *newval); const struct bond_opt_value *newval);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/netns/generic.h> #include <net/netns/generic.h>
#include "bonding.h" #include <net/bonding.h>
static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos) static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <net/netns/generic.h> #include <net/netns/generic.h>
#include <linux/nsproxy.h> #include <linux/nsproxy.h>
#include "bonding.h" #include <net/bonding.h>
#define to_dev(obj) container_of(obj, struct device, kobj) #define to_dev(obj) container_of(obj, struct device, kobj)
#define to_bond(cd) ((struct bonding *)(netdev_priv(to_net_dev(cd)))) #define to_bond(cd) ((struct bonding *)(netdev_priv(to_net_dev(cd))))
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include "bonding.h" #include <net/bonding.h>
struct slave_attribute { struct slave_attribute {
struct attribute attr; struct attribute attr;
......
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
#include <net/neighbour.h> #include <net/neighbour.h>
#include <net/netevent.h> #include <net/netevent.h>
#include <net/addrconf.h> #include <net/addrconf.h>
#include <net/bonding.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "cxgb4.h" #include "cxgb4.h"
...@@ -71,8 +72,6 @@ ...@@ -71,8 +72,6 @@
#include "cxgb4_debugfs.h" #include "cxgb4_debugfs.h"
#include "l2t.h" #include "l2t.h"
#include <../drivers/net/bonding/bonding.h>
#ifdef DRV_VERSION #ifdef DRV_VERSION
#undef DRV_VERSION #undef DRV_VERSION
#endif #endif
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* *
*/ */
#ifndef __BOND_3AD_H__ #ifndef _NET_BOND_3AD_H
#define __BOND_3AD_H__ #define _NET_BOND_3AD_H
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
...@@ -279,5 +279,5 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond, ...@@ -279,5 +279,5 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
struct slave *slave); struct slave *slave);
int bond_3ad_set_carrier(struct bonding *bond); int bond_3ad_set_carrier(struct bonding *bond);
void bond_3ad_update_lacp_rate(struct bonding *bond); void bond_3ad_update_lacp_rate(struct bonding *bond);
#endif /* __BOND_3AD_H__ */ #endif /* _NET_BOND_3AD_H */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* *
*/ */
#ifndef __BOND_ALB_H__ #ifndef _NET_BOND_ALB_H
#define __BOND_ALB_H__ #define _NET_BOND_ALB_H
#include <linux/if_ether.h> #include <linux/if_ether.h>
...@@ -177,5 +177,5 @@ int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev); ...@@ -177,5 +177,5 @@ int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev);
void bond_alb_monitor(struct work_struct *); void bond_alb_monitor(struct work_struct *);
int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr); int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr);
void bond_alb_clear_vlan(struct bonding *bond, unsigned short vlan_id); void bond_alb_clear_vlan(struct bonding *bond, unsigned short vlan_id);
#endif /* __BOND_ALB_H__ */ #endif /* _NET_BOND_ALB_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#ifndef _BOND_OPTIONS_H #ifndef _NET_BOND_OPTIONS_H
#define _BOND_OPTIONS_H #define _NET_BOND_OPTIONS_H
#define BOND_OPT_MAX_NAMELEN 32 #define BOND_OPT_MAX_NAMELEN 32
#define BOND_OPT_VALID(opt) ((opt) < BOND_OPT_LAST) #define BOND_OPT_VALID(opt) ((opt) < BOND_OPT_LAST)
...@@ -127,4 +127,4 @@ static inline void __bond_opt_init(struct bond_opt_value *optval, ...@@ -127,4 +127,4 @@ static inline void __bond_opt_init(struct bond_opt_value *optval,
void bond_option_arp_ip_targets_clear(struct bonding *bond); void bond_option_arp_ip_targets_clear(struct bonding *bond);
#endif /* _BOND_OPTIONS_H */ #endif /* _NET_BOND_OPTIONS_H */
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
* *
*/ */
#ifndef _LINUX_BONDING_H #ifndef _NET_BONDING_H
#define _LINUX_BONDING_H #define _NET_BONDING_H
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#include <linux/reciprocal_div.h> #include <linux/reciprocal_div.h>
#include <linux/if_link.h> #include <linux/if_link.h>
#include "bond_3ad.h" #include <net/bond_3ad.h>
#include "bond_alb.h" #include <net/bond_alb.h>
#include "bond_options.h" #include <net/bond_options.h>
#define DRV_VERSION "3.7.1" #define DRV_VERSION "3.7.1"
#define DRV_RELDATE "April 27, 2011" #define DRV_RELDATE "April 27, 2011"
...@@ -651,4 +651,4 @@ static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb) ...@@ -651,4 +651,4 @@ static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
#endif /* _LINUX_BONDING_H */ #endif /* _NET_BONDING_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment