Merge branch '20130926_include_linux_networking_externs' of git://repo.or.cz/linux...

Conflicts:
	include/linux/netdevice.h

More extern removals from Joe Perches.

Minor conflict with the dev_notify_flags changes which added a new
argument to __dev_notify_flags().

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc include/linux/netdevice.h
index f44f99a6997754e7650435e46db2c429c45b18ed,5f01af3927ca560816a080dbfee9c28ad3487499..f5cd464271bff1b7c4a92862d3ada2f685ff560c
--- 1/include/linux/netdevice.h
--- 2/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2367,37 -2362,30 +2362,31 @@@ static inline void napi_free_frags(stru
        napi->skb = NULL;
  }
  
- extern int netdev_rx_handler_register(struct net_device *dev,
-                                     rx_handler_func_t *rx_handler,
-                                     void *rx_handler_data);
- extern void netdev_rx_handler_unregister(struct net_device *dev);
- 
- extern bool           dev_valid_name(const char *name);
- extern int            dev_ioctl(struct net *net, unsigned int cmd, void __user *);
- extern int            dev_ethtool(struct net *net, struct ifreq *);
- extern unsigned int   dev_get_flags(const struct net_device *);
- extern int            __dev_change_flags(struct net_device *, unsigned int flags);
- extern int            dev_change_flags(struct net_device *, unsigned int);
- void                  __dev_notify_flags(struct net_device *,
-                                          unsigned int old_flags,
-                                          unsigned int gchanges);
- extern int            dev_change_name(struct net_device *, const char *);
- extern int            dev_set_alias(struct net_device *, const char *, size_t);
- extern int            dev_change_net_namespace(struct net_device *,
-                                                struct net *, const char *);
- extern int            dev_set_mtu(struct net_device *, int);
- extern void           dev_set_group(struct net_device *, int);
- extern int            dev_set_mac_address(struct net_device *,
-                                           struct sockaddr *);
- extern int            dev_change_carrier(struct net_device *,
-                                          bool new_carrier);
- extern int            dev_get_phys_port_id(struct net_device *dev,
-                                            struct netdev_phys_port_id *ppid);
- extern int            dev_hard_start_xmit(struct sk_buff *skb,
-                                           struct net_device *dev,
-                                           struct netdev_queue *txq);
- extern int            dev_forward_skb(struct net_device *dev,
-                                       struct sk_buff *skb);
+ int netdev_rx_handler_register(struct net_device *dev,
+                              rx_handler_func_t *rx_handler,
+                              void *rx_handler_data);
+ void netdev_rx_handler_unregister(struct net_device *dev);
+ 
+ bool dev_valid_name(const char *name);
+ int dev_ioctl(struct net *net, unsigned int cmd, void __user *);
+ int dev_ethtool(struct net *net, struct ifreq *);
+ unsigned int dev_get_flags(const struct net_device *);
+ int __dev_change_flags(struct net_device *, unsigned int flags);
+ int dev_change_flags(struct net_device *, unsigned int);
 -void __dev_notify_flags(struct net_device *, unsigned int old_flags);
++void __dev_notify_flags(struct net_device *, unsigned int old_flags,
++                      unsigned int gchanges);
+ int dev_change_name(struct net_device *, const char *);
+ int dev_set_alias(struct net_device *, const char *, size_t);
+ int dev_change_net_namespace(struct net_device *, struct net *, const char *);
+ int dev_set_mtu(struct net_device *, int);
+ void dev_set_group(struct net_device *, int);
+ int dev_set_mac_address(struct net_device *, struct sockaddr *);
+ int dev_change_carrier(struct net_device *, bool new_carrier);
+ int dev_get_phys_port_id(struct net_device *dev,
+                        struct netdev_phys_port_id *ppid);
+ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
+                       struct netdev_queue *txq);
+ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb);
  
  extern int            netdev_budget;