Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (48 commits)
  [PATCH] bonding: update version number
  [PATCH] git-netdev-all: pc300_tty build fix
  [PATCH] Make PC300 WAN driver compile again
  [PATCH] Modularize generic HDLC
  [PATCH] more s2io __iomem annotations
  [PATCH] restore __iomem annotations in e1000
  [PATCH] 64bit bugs in s2io
  [PATCH] bonding: Fix primary selection error at enslavement time
  [PATCH] bonding: Don't mangle LACPDUs
  [PATCH] bonding: Validate probe replies in ARP monitor
  [PATCH] bonding: Don't release slaves when master is admin down
  [PATCH] bonding: Add priv_flag to avoid event mishandling
  [PATCH] bonding: Handle large hard_header_len
  [PATCH] bonding: Remove unneeded NULL test
  [PATCH] bonding: Format fix in seq_printf call
  [PATCH] bonding: Convert delay value from s16 to int
  [PATCH] bonding: Allow bonding to enslave a 10 Gig adapter
  Delete unused drivers/net/gt64240eth.h
  [PATCH] skge: fiber support
  [PATCH] fix possible NULL ptr deref in forcedeth
  ...

5 files changed, 105 insertions, 163 deletions

diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h
index d5ebbb29aeae..d4b333938f73 100644
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
@@ -11,95 +11,46 @@
 #ifndef __HDLC_H
 #define __HDLC_H
 
-#define GENERIC_HDLC_VERSION 4  /* For synchronization with sethdlc utility */
-
-#define CLOCK_DEFAULT   0       /* Default setting */
-#define CLOCK_EXT       1       /* External TX and RX clock - DTE */
-#define CLOCK_INT       2       /* Internal TX and RX clock - DCE */
-#define CLOCK_TXINT     3       /* Internal TX and external RX clock */
-#define CLOCK_TXFROMRX  4       /* TX clock derived from external RX clock */
-
-
-#define ENCODING_DEFAULT        0 /* Default setting */
-#define ENCODING_NRZ            1
-#define ENCODING_NRZI           2
-#define ENCODING_FM_MARK        3
-#define ENCODING_FM_SPACE       4
-#define ENCODING_MANCHESTER     5
-
-
-#define PARITY_DEFAULT          0 /* Default setting */
-#define PARITY_NONE             1 /* No parity */
-#define PARITY_CRC16_PR0        2 /* CRC16, initial value 0x0000 */
-#define PARITY_CRC16_PR1        3 /* CRC16, initial value 0xFFFF */
-#define PARITY_CRC16_PR0_CCITT  4 /* CRC16, initial 0x0000, ITU-T version */
-#define PARITY_CRC16_PR1_CCITT  5 /* CRC16, initial 0xFFFF, ITU-T version */
-#define PARITY_CRC32_PR0_CCITT  6 /* CRC32, initial value 0x00000000 */
-#define PARITY_CRC32_PR1_CCITT  7 /* CRC32, initial value 0xFFFFFFFF */
-
-#define LMI_DEFAULT             0 /* Default setting */
-#define LMI_NONE                1 /* No LMI, all PVCs are static */
-#define LMI_ANSI                2 /* ANSI Annex D */
-#define LMI_CCITT               3 /* ITU-T Annex A */
-#define LMI_CISCO               4 /* The "original" LMI, aka Gang of Four */
 
 #define HDLC_MAX_MTU 1500       /* Ethernet 1500 bytes */
+#if 0
 #define HDLC_MAX_MRU (HDLC_MAX_MTU + 10 + 14 + 4) /* for ETH+VLAN over FR */
+#else
+#define HDLC_MAX_MRU 1600 /* as required for FR network */
+#endif
 
 
 #ifdef __KERNEL__
 
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <net/syncppp.h>
 #include <linux/hdlc/ioctl.h>
 
 
-typedef struct {                /* Used in Cisco and PPP mode */
-        u8 address;
-        u8 control;
-        u16 protocol;
-}__attribute__ ((packed)) hdlc_header;
-
-
-
-typedef struct {
-        u32 type;               /* code */
-        u32 par1;
-        u32 par2;
-        u16 rel;                /* reliability */
-        u32 time;
-}__attribute__ ((packed)) cisco_packet;
-#define CISCO_PACKET_LEN        18
-#define CISCO_BIG_PACKET_LEN    20
-
-
-
-typedef struct pvc_device_struct {
-        struct net_device *master;
-        struct net_device *main;
-        struct net_device *ether; /* bridged Ethernet interface */
-        struct pvc_device_struct *next; /* Sorted in ascending DLCI order */
-        int dlci;
-        int open_count;
-
-        struct {
-                unsigned int new: 1;
-                unsigned int active: 1;
-                unsigned int exist: 1;
-                unsigned int deleted: 1;
-                unsigned int fecn: 1;
-                unsigned int becn: 1;
-                unsigned int bandwidth; /* Cisco LMI reporting only */
-        }state;
-}pvc_device;
-
-
-
-typedef struct hdlc_device_struct {
-        /* To be initialized by hardware driver */
+/* Used by all network devices here, pointed to by netdev_priv(dev) */
+struct hdlc_device_desc {
+        int (*netif_rx)(struct sk_buff *skb);
         struct net_device_stats stats;
-
+};
+
+/* This structure is a private property of HDLC protocols.
+   Hardware drivers have no interest here */
+
+struct hdlc_proto {
+        int (*open)(struct net_device *dev);
+        void (*close)(struct net_device *dev);
+        void (*start)(struct net_device *dev); /* if open & DCD */
+        void (*stop)(struct net_device *dev); /* if open & !DCD */
+        void (*detach)(struct net_device *dev);
+        int (*ioctl)(struct net_device *dev, struct ifreq *ifr);
+        unsigned short (*type_trans)(struct sk_buff *skb,
+                                     struct net_device *dev);
+        struct module *module;
+        struct hdlc_proto *next; /* next protocol in the list */
+};
+
+
+typedef struct hdlc_device {
         /* used by HDLC layer to take control over HDLC device from hw driver*/
         int (*attach)(struct net_device *dev,
                       unsigned short encoding, unsigned short parity);
@@ -107,82 +58,18 @@ typedef struct hdlc_device_struct {
         /* hardware driver must handle this instead of dev->hard_start_xmit */
         int (*xmit)(struct sk_buff *skb, struct net_device *dev);
 
-
         /* Things below are for HDLC layer internal use only */
-        struct {
-                int (*open)(struct net_device *dev);
-                void (*close)(struct net_device *dev);
-
-                /* if open & DCD */
-                void (*start)(struct net_device *dev);
-                /* if open & !DCD */
-                void (*stop)(struct net_device *dev);
-
-                void (*detach)(struct hdlc_device_struct *hdlc);
-                int (*netif_rx)(struct sk_buff *skb);
-                unsigned short (*type_trans)(struct sk_buff *skb,
-                                             struct net_device *dev);
-                int id;         /* IF_PROTO_HDLC/CISCO/FR/etc. */
-        }proto;
-
+        const struct hdlc_proto *proto;
         int carrier;
         int open;
         spinlock_t state_lock;
-
-        union {
-                struct {
-                        fr_proto settings;
-                        pvc_device *first_pvc;
-                        int dce_pvc_count;
-
-                        struct timer_list timer;
-                        unsigned long last_poll;
-                        int reliable;
-                        int dce_changed;
-                        int request;
-                        int fullrep_sent;
-                        u32 last_errors; /* last errors bit list */
-                        u8 n391cnt;
-                        u8 txseq; /* TX sequence number */
-                        u8 rxseq; /* RX sequence number */
-                }fr;
-
-                struct {
-                        cisco_proto settings;
-
-                        struct timer_list timer;
-                        unsigned long last_poll;
-                        int up;
-                        int request_sent;
-                        u32 txseq; /* TX sequence number */
-                        u32 rxseq; /* RX sequence number */
-                }cisco;
-
-                struct {
-                        raw_hdlc_proto settings;
-                }raw_hdlc;
-
-                struct {
-                        struct ppp_device pppdev;
-                        struct ppp_device *syncppp_ptr;
-                        int (*old_change_mtu)(struct net_device *dev,
-                                              int new_mtu);
-                }ppp;
-        }state;
+        void *state;
         void *priv;
 }hdlc_device;
 
 
 
-int hdlc_raw_ioctl(struct net_device *dev, struct ifreq *ifr);
-int hdlc_raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr);
-int hdlc_cisco_ioctl(struct net_device *dev, struct ifreq *ifr);
-int hdlc_ppp_ioctl(struct net_device *dev, struct ifreq *ifr);
-int hdlc_fr_ioctl(struct net_device *dev, struct ifreq *ifr);
-int hdlc_x25_ioctl(struct net_device *dev, struct ifreq *ifr);
-
-
-/* Exported from hdlc.o */
+/* Exported from hdlc module */
 
 /* Called by hardware driver when a user requests HDLC service */
 int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
@@ -191,17 +78,21 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 #define register_hdlc_device(dev)       register_netdev(dev)
 void unregister_hdlc_device(struct net_device *dev);
 
+
+void register_hdlc_protocol(struct hdlc_proto *proto);
+void unregister_hdlc_protocol(struct hdlc_proto *proto);
+
 struct net_device *alloc_hdlcdev(void *priv);
 
-static __inline__ hdlc_device* dev_to_hdlc(struct net_device *dev)
+
+static __inline__ struct hdlc_device_desc* dev_to_desc(struct net_device *dev)
 {
         return netdev_priv(dev);
 }
 
-
-static __inline__ pvc_device* dev_to_pvc(struct net_device *dev)
+static __inline__ hdlc_device* dev_to_hdlc(struct net_device *dev)
 {
-        return (pvc_device*)dev->priv;
+        return netdev_priv(dev) + sizeof(struct hdlc_device_desc);
 }
 
 
@@ -225,18 +116,14 @@ int hdlc_open(struct net_device *dev);
 /* Must be called by hardware driver when HDLC device is being closed */
 void hdlc_close(struct net_device *dev);
 
+int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,
+                         int (*rx)(struct sk_buff *skb), size_t size);
 /* May be used by hardware driver to gain control over HDLC device */
-static __inline__ void hdlc_proto_detach(hdlc_device *hdlc)
-{
-        if (hdlc->proto.detach)
-                hdlc->proto.detach(hdlc);
-        hdlc->proto.detach = NULL;
-}
-
+void detach_hdlc_protocol(struct net_device *dev);
 
 static __inline__ struct net_device_stats *hdlc_stats(struct net_device *dev)
 {
-        return &dev_to_hdlc(dev)->stats;
+        return &dev_to_desc(dev)->stats;
 }
 
 
@@ -248,8 +135,8 @@ static __inline__ __be16 hdlc_type_trans(struct sk_buff *skb,
         skb->mac.raw  = skb->data;
         skb->dev      = dev;
 
-        if (hdlc->proto.type_trans)
-                return hdlc->proto.type_trans(skb, dev);
+        if (hdlc->proto->type_trans)
+                return hdlc->proto->type_trans(skb, dev);
         else
                 return htons(ETH_P_HDLC);
 }
diff --git a/include/linux/hdlc/ioctl.h b/include/linux/hdlc/ioctl.h
index 78430ba3ea69..583972364357 100644
--- a/include/linux/hdlc/ioctl.h
+++ b/include/linux/hdlc/ioctl.h
@@ -1,6 +1,39 @@
 #ifndef __HDLC_IOCTL_H__
 #define __HDLC_IOCTL_H__
 
+
+#define GENERIC_HDLC_VERSION 4  /* For synchronization with sethdlc utility */
+
+#define CLOCK_DEFAULT   0       /* Default setting */
+#define CLOCK_EXT       1       /* External TX and RX clock - DTE */
+#define CLOCK_INT       2       /* Internal TX and RX clock - DCE */
+#define CLOCK_TXINT     3       /* Internal TX and external RX clock */
+#define CLOCK_TXFROMRX  4       /* TX clock derived from external RX clock */
+
+
+#define ENCODING_DEFAULT        0 /* Default setting */
+#define ENCODING_NRZ            1
+#define ENCODING_NRZI           2
+#define ENCODING_FM_MARK        3
+#define ENCODING_FM_SPACE       4
+#define ENCODING_MANCHESTER     5
+
+
+#define PARITY_DEFAULT          0 /* Default setting */
+#define PARITY_NONE             1 /* No parity */
+#define PARITY_CRC16_PR0        2 /* CRC16, initial value 0x0000 */
+#define PARITY_CRC16_PR1        3 /* CRC16, initial value 0xFFFF */
+#define PARITY_CRC16_PR0_CCITT  4 /* CRC16, initial 0x0000, ITU-T version */
+#define PARITY_CRC16_PR1_CCITT  5 /* CRC16, initial 0xFFFF, ITU-T version */
+#define PARITY_CRC32_PR0_CCITT  6 /* CRC32, initial value 0x00000000 */
+#define PARITY_CRC32_PR1_CCITT  7 /* CRC32, initial value 0xFFFFFFFF */
+
+#define LMI_DEFAULT             0 /* Default setting */
+#define LMI_NONE                1 /* No LMI, all PVCs are static */
+#define LMI_ANSI                2 /* ANSI Annex D */
+#define LMI_CCITT               3 /* ITU-T Annex A */
+#define LMI_CISCO               4 /* The "original" LMI, aka Gang of Four */
+
 typedef struct { 
         unsigned int clock_rate; /* bits per second */
         unsigned int clock_type; /* internal, external, TX-internal etc. */
diff --git a/include/linux/if.h b/include/linux/if.h
index cd080d765324..8018c2e22c0c 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -59,6 +59,8 @@
 #define IFF_SLAVE_INACTIVE      0x4     /* bonding slave not the curr. active */
 #define IFF_MASTER_8023AD       0x8     /* bonding master, 802.3ad.     */
 #define IFF_MASTER_ALB  0x10            /* bonding master, balance-alb. */
+#define IFF_BONDING     0x20            /* bonding master or slave      */
+#define IFF_SLAVE_NEEDARP 0x40          /* need ARPs for validation     */
 
 #define IF_GET_IFACE    0x0001          /* for querying only */
 #define IF_GET_PROTO    0x0002
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 43289127b458..13d6d4eb8b3a 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -334,7 +334,6 @@ struct net_device
 
 
         struct net_device_stats* (*get_stats)(struct net_device *dev);
-        struct iw_statistics*   (*get_wireless_stats)(struct net_device *dev);
 
         /* List of functions to handle Wireless Extensions (instead of ioctl).
          * See <net/iw_handler.h> for details. Jean II */
@@ -1016,7 +1015,8 @@ static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
 }
 
 /* On bonding slaves other than the currently active slave, suppress
- * duplicates except for 802.3ad ETH_P_SLOW and alb non-mcast/bcast.
+ * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and
+ * ARP on active-backup slaves with arp_validate enabled.
  */
 static inline int skb_bond_should_drop(struct sk_buff *skb)
 {
@@ -1025,6 +1025,10 @@ static inline int skb_bond_should_drop(struct sk_buff *skb)
 
         if (master &&
             (dev->priv_flags & IFF_SLAVE_INACTIVE)) {
+                if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&
+                    skb->protocol == __constant_htons(ETH_P_ARP))
+                        return 0;
+
                 if (master->priv_flags & IFF_MASTER_ALB) {
                         if (skb->pkt_type != PACKET_BROADCAST &&
                             skb->pkt_type != PACKET_MULTICAST)
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index 13588564b42b..a50a0130fd9e 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -1,7 +1,7 @@
 /*
  * This file define a set of standard wireless extensions
  *
- * Version :    20      17.2.06
+ * Version :    21      14.3.06
  *
  * Authors :    Jean Tourrilhes - HPL - <jt@hpl.hp.com>
  * Copyright (c) 1997-2006 Jean Tourrilhes, All Rights Reserved.
@@ -69,9 +69,14 @@
 
 /***************************** INCLUDES *****************************/
 
+/* This header is used in user-space, therefore need to be sanitised
+ * for that purpose. Those includes are usually not compatible with glibc.
+ * To know which includes to use in user-space, check iwlib.h. */
+#ifdef __KERNEL__
 #include <linux/types.h>                /* for "caddr_t" et al          */
 #include <linux/socket.h>               /* for "struct sockaddr" et al  */
 #include <linux/if.h>                   /* for IFNAMSIZ and co... */
+#endif  /* __KERNEL__ */
 
 /***************************** VERSION *****************************/
 /*
@@ -80,7 +85,7 @@
  * (there is some stuff that will be added in the future...)
  * I just plan to increment with each new version.
  */
-#define WIRELESS_EXT    20
+#define WIRELESS_EXT    21
 
 /*
  * Changes :
@@ -208,6 +213,14 @@
  * V19 to V20
  * ----------
  *      - RtNetlink requests support (SET/GET)
+ *
+ * V20 to V21
+ * ----------
+ *      - Remove (struct net_device *)->get_wireless_stats()
+ *      - Change length in ESSID and NICK to strlen() instead of strlen()+1
+ *      - Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
+ *      - Power/Retry relative values no longer * 100000
+ *      - Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI
  */
 
 /**************************** CONSTANTS ****************************/
@@ -448,6 +461,7 @@
 #define IW_QUAL_QUAL_INVALID    0x10    /* Driver doesn't provide value */
 #define IW_QUAL_LEVEL_INVALID   0x20
 #define IW_QUAL_NOISE_INVALID   0x40
+#define IW_QUAL_RCPI            0x80    /* Level + Noise are 802.11k RCPI */
 #define IW_QUAL_ALL_INVALID     0x70
 
 /* Frequency flags */
@@ -500,10 +514,12 @@
 #define IW_RETRY_TYPE           0xF000  /* Type of parameter */
 #define IW_RETRY_LIMIT          0x1000  /* Maximum number of retries*/
 #define IW_RETRY_LIFETIME       0x2000  /* Maximum duration of retries in us */
-#define IW_RETRY_MODIFIER       0x000F  /* Modify a parameter */
+#define IW_RETRY_MODIFIER       0x00FF  /* Modify a parameter */
 #define IW_RETRY_MIN            0x0001  /* Value is a minimum  */
 #define IW_RETRY_MAX            0x0002  /* Value is a maximum */
 #define IW_RETRY_RELATIVE       0x0004  /* Value is not in seconds/ms/us */
+#define IW_RETRY_SHORT          0x0010  /* Value is for short packets  */
+#define IW_RETRY_LONG           0x0020  /* Value is for long packets */
 
 /* Scanning request flags */
 #define IW_SCAN_DEFAULT         0x0000  /* Default scan of the driver */
@@ -1017,7 +1033,7 @@ struct	iw_range
         /* Note : this frequency list doesn't need to fit channel numbers,
          * because each entry contain its channel index */
 
-        __u32           enc_capa; /* IW_ENC_CAPA_* bit field */
+        __u32           enc_capa;       /* IW_ENC_CAPA_* bit field */
 };
 
 /*