9 files changed, 128 insertions, 105 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 05c29c01174c..34de8b21f6d4 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -493,6 +493,7 @@ struct ieee80211s_hdr {
 /* Mesh flags */
 #define MESH_FLAGS_AE_A4        0x1
 #define MESH_FLAGS_AE_A5_A6     0x2
+#define MESH_FLAGS_AE           0x3
 #define MESH_FLAGS_PS_DEEP      0x4
 
 /**
@@ -1085,6 +1086,14 @@ enum ieee80211_spectrum_mgmt_actioncode {
         WLAN_ACTION_SPCT_CHL_SWITCH = 4,
 };
 
+/* Security key length */
+enum ieee80211_key_len {
+        WLAN_KEY_LEN_WEP40 = 5,
+        WLAN_KEY_LEN_WEP104 = 13,
+        WLAN_KEY_LEN_CCMP = 16,
+        WLAN_KEY_LEN_TKIP = 32,
+};
+
 /*
  * IEEE 802.11-2007 7.3.2.9 Country information element
  *
diff --git a/include/linux/mISDNdsp.h b/include/linux/mISDNdsp.h
index 6b71d2dce508..41d1eeb9b3bd 100644
--- a/include/linux/mISDNdsp.h
+++ b/include/linux/mISDNdsp.h
@@ -12,7 +12,8 @@ struct mISDN_dsp_element {
         void    *(*new)(const char *arg);
         void    (*free)(void *p);
         void    (*process_tx)(void *p, unsigned char *data, int len);
-        void    (*process_rx)(void *p, unsigned char *data, int len);
+        void    (*process_rx)(void *p, unsigned char *data, int len,
+                        unsigned int txlen);
         int     num_args;
         struct mISDN_dsp_element_arg
                 *args;
@@ -24,6 +25,7 @@ extern void mISDN_dsp_element_unregister(struct mISDN_dsp_element *elem);
 struct dsp_features {
         int     hfc_id; /* unique id to identify the chip (or -1) */
         int     hfc_dtmf; /* set if HFCmulti card supports dtmf */
+        int     hfc_conf; /* set if HFCmulti card supports conferences */
         int     hfc_loops; /* set if card supports tone loops */
         int     hfc_echocanhw; /* set if card supports echocancelation*/
         int     pcm_id; /* unique id to identify the pcm bus (or -1) */
diff --git a/include/linux/mISDNhw.h b/include/linux/mISDNhw.h
index 97ffdc1d3442..ce900f4c2458 100644
--- a/include/linux/mISDNhw.h
+++ b/include/linux/mISDNhw.h
@@ -185,7 +185,7 @@ extern int	dchannel_senddata(struct dchannel *, struct sk_buff *);
 extern int      bchannel_senddata(struct bchannel *, struct sk_buff *);
 extern void     recv_Dchannel(struct dchannel *);
 extern void     recv_Echannel(struct dchannel *, struct dchannel *);
-extern void     recv_Bchannel(struct bchannel *);
+extern void     recv_Bchannel(struct bchannel *, unsigned int id);
 extern void     recv_Dchannel_skb(struct dchannel *, struct sk_buff *);
 extern void     recv_Bchannel_skb(struct bchannel *, struct sk_buff *);
 extern void     confirm_Bsend(struct bchannel *bch);
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index 5da3d95b27f1..45100b39a7cf 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -229,6 +229,7 @@
 #define OPTION_L2_PTP           2
 #define OPTION_L2_FIXEDTEI      3
 #define OPTION_L2_CLEANUP       4
+#define OPTION_L1_HOLD          5
 
 /* should be in sync with linux/kobject.h:KOBJ_NAME_LEN */
 #define MISDN_MAX_IDLEN         20
@@ -291,19 +292,19 @@ struct mISDN_devrename {
 
 /* MPH_INFORMATION_REQ payload */
 struct ph_info_ch {
-        __u32 protocol;
-        __u64 Flags;
+        __u32 protocol;
+        __u64 Flags;
 };
 
 struct ph_info_dch {
-        struct ph_info_ch ch;
-        __u16 state;
-        __u16 num_bch;
+        struct ph_info_ch ch;
+        __u16 state;
+        __u16 num_bch;
 };
 
 struct ph_info {
-        struct ph_info_dch dch;
-        struct ph_info_ch  bch[];
+        struct ph_info_dch dch;
+        struct ph_info_ch  bch[];
 };
 
 /* timer device ioctl */
@@ -317,6 +318,7 @@ struct ph_info {
 #define IMCTRLREQ       _IOR('I', 69, int)
 #define IMCLEAR_L2      _IOR('I', 70, int)
 #define IMSETDEVNAME    _IOR('I', 71, struct mISDN_devrename)
+#define IMHOLD_L1       _IOR('I', 72, int)
 
 static inline int
 test_channelmap(u_int nr, u_char *map)
@@ -362,7 +364,8 @@ clear_channelmap(u_int nr, u_char *map)
 #define MISDN_CTRL_HFC_RECEIVE_ON       0x4006
 #define MISDN_CTRL_HFC_ECHOCAN_ON       0x4007
 #define MISDN_CTRL_HFC_ECHOCAN_OFF      0x4008
-
+#define MISDN_CTRL_HFC_WD_INIT          0x4009
+#define MISDN_CTRL_HFC_WD_RESET         0x400A
 
 /* socket options */
 #define MISDN_TIME_STAMP                0x0001
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f8574e76b743..8e03b06e638e 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -901,49 +901,10 @@ struct net_device
         /* max exchange id for FCoE LRO by ddp */
         unsigned int            fcoe_ddp_xid;
 #endif
-
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-        struct {
-                int                     (*init)(struct net_device *dev);
-                void                    (*uninit)(struct net_device *dev);
-                int                     (*open)(struct net_device *dev);
-                int                     (*stop)(struct net_device *dev);
-                int                     (*hard_start_xmit) (struct sk_buff *skb,
-                                                            struct net_device *dev);
-                u16                     (*select_queue)(struct net_device *dev,
-                                                        struct sk_buff *skb);
-                void                    (*change_rx_flags)(struct net_device *dev,
-                                                           int flags);
-                void                    (*set_rx_mode)(struct net_device *dev);
-                void                    (*set_multicast_list)(struct net_device *dev);
-                int                     (*set_mac_address)(struct net_device *dev,
-                                                           void *addr);
-                int                     (*validate_addr)(struct net_device *dev);
-                int                     (*do_ioctl)(struct net_device *dev,
-                                                    struct ifreq *ifr, int cmd);
-                int                     (*set_config)(struct net_device *dev,
-                                                      struct ifmap *map);
-                int                     (*change_mtu)(struct net_device *dev, int new_mtu);
-                int                     (*neigh_setup)(struct net_device *dev,
-                                                       struct neigh_parms *);
-                void                    (*tx_timeout) (struct net_device *dev);
-                struct net_device_stats* (*get_stats)(struct net_device *dev);
-                void                    (*vlan_rx_register)(struct net_device *dev,
-                                                            struct vlan_group *grp);
-                void                    (*vlan_rx_add_vid)(struct net_device *dev,
-                                                           unsigned short vid);
-                void                    (*vlan_rx_kill_vid)(struct net_device *dev,
-                                                            unsigned short vid);
-#ifdef CONFIG_NET_POLL_CONTROLLER
-                void                    (*poll_controller)(struct net_device *dev);
-#endif
-        };
-#endif
 };
 #define to_net_dev(d) container_of(d, struct net_device, dev)
 
 #define NETDEV_ALIGN            32
-#define NETDEV_ALIGN_CONST      (NETDEV_ALIGN - 1)
 
 static inline
 struct netdev_queue *netdev_get_tx_queue(const struct net_device *dev,
@@ -1014,9 +975,7 @@ static inline bool netdev_uses_trailer_tags(struct net_device *dev)
  */
 static inline void *netdev_priv(const struct net_device *dev)
 {
-        return (char *)dev + ((sizeof(struct net_device)
-                               + NETDEV_ALIGN_CONST)
-                              & ~NETDEV_ALIGN_CONST);
+        return (char *)dev + ALIGN(sizeof(struct net_device), NETDEV_ALIGN);
 }
 
 /* Set the sysfs physical device reference for the network logical device
@@ -1046,6 +1005,12 @@ void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
 void netif_napi_del(struct napi_struct *napi);
 
 struct napi_gro_cb {
+        /* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */
+        void *frag0;
+
+        /* Length of frag0. */
+        unsigned int frag0_len;
+
         /* This indicates where we are processing relative to skb->data. */
         int data_offset;
 
@@ -1145,9 +1110,9 @@ extern int		dev_restart(struct net_device *dev);
 #ifdef CONFIG_NETPOLL_TRAP
 extern int              netpoll_trap(void);
 #endif
-extern void           *skb_gro_header(struct sk_buff *skb, unsigned int hlen);
 extern int             skb_gro_receive(struct sk_buff **head,
                                        struct sk_buff *skb);
+extern void            skb_gro_reset_offset(struct sk_buff *skb);
 
 static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
 {
@@ -1164,23 +1129,34 @@ static inline void skb_gro_pull(struct sk_buff *skb, unsigned int len)
         NAPI_GRO_CB(skb)->data_offset += len;
 }
 
-static inline void skb_gro_reset_offset(struct sk_buff *skb)
+static inline void *skb_gro_header_fast(struct sk_buff *skb,
+                                        unsigned int offset)
 {
-        NAPI_GRO_CB(skb)->data_offset = 0;
+        return NAPI_GRO_CB(skb)->frag0 + offset;
+}
+
+static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen)
+{
+        return NAPI_GRO_CB(skb)->frag0_len < hlen;
+}
+
+static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
+                                        unsigned int offset)
+{
+        NAPI_GRO_CB(skb)->frag0 = NULL;
+        NAPI_GRO_CB(skb)->frag0_len = 0;
+        return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL;
 }
 
 static inline void *skb_gro_mac_header(struct sk_buff *skb)
 {
-        return skb_headlen(skb) ? skb_mac_header(skb) :
-               page_address(skb_shinfo(skb)->frags[0].page) +
-               skb_shinfo(skb)->frags[0].page_offset;
+        return NAPI_GRO_CB(skb)->frag0 ?: skb_mac_header(skb);
 }
 
 static inline void *skb_gro_network_header(struct sk_buff *skb)
 {
-        return skb_headlen(skb) ? skb_network_header(skb) :
-               page_address(skb_shinfo(skb)->frags[0].page) +
-               skb_shinfo(skb)->frags[0].page_offset + skb_network_offset(skb);
+        return (NAPI_GRO_CB(skb)->frag0 ?: skb->data) +
+               skb_network_offset(skb);
 }
 
 static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
@@ -1712,6 +1688,12 @@ static inline void __netif_tx_unlock_bh(struct netdev_queue *txq)
         spin_unlock_bh(&txq->_xmit_lock);
 }
 
+static inline void txq_trans_update(struct netdev_queue *txq)
+{
+        if (txq->xmit_lock_owner != -1)
+                txq->trans_start = jiffies;
+}
+
 /**
  *      netif_tx_lock - grab network device transmit lock
  *      @dev: network device
@@ -1993,4 +1975,4 @@ static inline u32 dev_ethtool_get_flags(struct net_device *dev)
 }
 #endif /* __KERNEL__ */
 
-#endif  /* _LINUX_DEV_H */
+#endif  /* _LINUX_NETDEVICE_H */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3038ac25491f..12db06cf0e23 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1914,6 +1914,8 @@
 #define PCI_SUBDEVICE_ID_CCD_SWYX4S     0xB540
 #define PCI_SUBDEVICE_ID_CCD_JH4S20     0xB550
 #define PCI_SUBDEVICE_ID_CCD_IOB8ST_1   0xB552
+#define PCI_SUBDEVICE_ID_CCD_JHSE1      0xB553
+#define PCI_SUBDEVICE_ID_CCD_JH8S       0xB55B
 #define PCI_SUBDEVICE_ID_CCD_BN4S       0xB560
 #define PCI_SUBDEVICE_ID_CCD_BN8S       0xB562
 #define PCI_SUBDEVICE_ID_CCD_BNE1       0xB563
diff --git a/include/linux/phy.h b/include/linux/phy.h
index c216e4e503b3..b1368b8f6572 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -79,7 +79,7 @@ typedef enum {
  * Need to be a little smaller than phydev->dev.bus_id to leave room
  * for the ":%02x"
  */
-#define MII_BUS_ID_SIZE (BUS_ID_SIZE - 3)
+#define MII_BUS_ID_SIZE (20 - 3)
 
 /*
  * The Bus class for PHYs.  Devices which provide access to
@@ -407,7 +407,7 @@ struct phy_driver {
 /* A Structure for boards to register fixups with the PHY Lib */
 struct phy_fixup {
         struct list_head list;
-        char bus_id[BUS_ID_SIZE];
+        char bus_id[20];
         u32 phy_uid;
         u32 phy_uid_mask;
         int (*run)(struct phy_device *phydev);
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 9e17a83d3432..f20da7d63b1e 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -56,9 +56,9 @@ enum ieee80211_band {
  *      on this channel.
  * @IEEE80211_CHAN_NO_IBSS: IBSS is not allowed on this channel.
  * @IEEE80211_CHAN_RADAR: Radar detection is required on this channel.
- * @IEEE80211_CHAN_NO_FAT_ABOVE: extension channel above this channel
+ * @IEEE80211_CHAN_NO_HT40PLUS: extension channel above this channel
  *      is not permitted.
- * @IEEE80211_CHAN_NO_FAT_BELOW: extension channel below this channel
+ * @IEEE80211_CHAN_NO_HT40MINUS: extension channel below this channel
  *      is not permitted.
  */
 enum ieee80211_channel_flags {
@@ -66,10 +66,13 @@ enum ieee80211_channel_flags {
         IEEE80211_CHAN_PASSIVE_SCAN     = 1<<1,
         IEEE80211_CHAN_NO_IBSS          = 1<<2,
         IEEE80211_CHAN_RADAR            = 1<<3,
-        IEEE80211_CHAN_NO_FAT_ABOVE     = 1<<4,
-        IEEE80211_CHAN_NO_FAT_BELOW     = 1<<5,
+        IEEE80211_CHAN_NO_HT40PLUS      = 1<<4,
+        IEEE80211_CHAN_NO_HT40MINUS     = 1<<5,
 };
 
+#define IEEE80211_CHAN_NO_HT40 \
+        (IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS)
+
 /**
  * struct ieee80211_channel - channel definition
  *
@@ -778,10 +781,11 @@ enum wiphy_params_flags {
  * @get_key: get information about the key with the given parameters.
  *      @mac_addr will be %NULL when requesting information for a group
  *      key. All pointers given to the @callback function need not be valid
- *      after it returns.
+ *      after it returns. This function should return an error if it is
+ *      not possible to retrieve the key, -ENOENT if it doesn't exist.
  *
  * @del_key: remove a key given the @mac_addr (%NULL for a group key)
- *      and @key_index
+ *      and @key_index, return -ENOENT if the key doesn't exist.
  *
  * @set_default_key: set the default key on an interface
  *
@@ -994,7 +998,7 @@ struct wiphy {
          * know whether it points to a wiphy your driver has registered
          * or not. Assign this to something global to your driver to
          * help determine whether you own this wiphy or not. */
-        void *privid;
+        const void *privid;
 
         struct ieee80211_supported_band *bands[IEEE80211_NUM_BANDS];
 
@@ -1070,7 +1074,7 @@ static inline const char *wiphy_name(struct wiphy *wiphy)
  * The returned pointer must be assigned to each netdev's
  * ieee80211_ptr for proper operation.
  */
-struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv);
+struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv);
 
 /**
  * wiphy_register - register a wiphy with cfg80211
@@ -1240,6 +1244,53 @@ extern int ieee80211_radiotap_iterator_init(
 extern int ieee80211_radiotap_iterator_next(
    struct ieee80211_radiotap_iterator *iterator);
 
+extern const unsigned char rfc1042_header[6];
+extern const unsigned char bridge_tunnel_header[6];
+
+/**
+ * ieee80211_get_hdrlen_from_skb - get header length from data
+ *
+ * Given an skb with a raw 802.11 header at the data pointer this function
+ * returns the 802.11 header length in bytes (not including encryption
+ * headers). If the data in the sk_buff is too short to contain a valid 802.11
+ * header the function returns 0.
+ *
+ * @skb: the frame
+ */
+unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
+
+/**
+ * ieee80211_hdrlen - get header length in bytes from frame control
+ * @fc: frame control field in little-endian format
+ */
+unsigned int ieee80211_hdrlen(__le16 fc);
+
+/**
+ * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3
+ * @skb: the 802.11 data frame
+ * @addr: the device MAC address
+ * @iftype: the virtual interface type
+ */
+int ieee80211_data_to_8023(struct sk_buff *skb, u8 *addr,
+                           enum nl80211_iftype iftype);
+
+/**
+ * ieee80211_data_from_8023 - convert an 802.3 frame to 802.11
+ * @skb: the 802.3 frame
+ * @addr: the device MAC address
+ * @iftype: the virtual interface type
+ * @bssid: the network bssid (used only for iftype STATION and ADHOC)
+ * @qos: build 802.11 QoS data frame
+ */
+int ieee80211_data_from_8023(struct sk_buff *skb, u8 *addr,
+                             enum nl80211_iftype iftype, u8 *bssid, bool qos);
+
+/**
+ * cfg80211_classify8021d - determine the 802.1p/1d tag for a data frame
+ * @skb: the data frame
+ */
+unsigned int cfg80211_classify8021d(struct sk_buff *skb);
+
 /*
  * Regulatory helper functions for wiphys
  */
@@ -1303,9 +1354,10 @@ extern void wiphy_apply_custom_regulatory(
  * freq_reg_info - get regulatory information for the given frequency
  * @wiphy: the wiphy for which we want to process this rule for
  * @center_freq: Frequency in KHz for which we want regulatory information for
- * @bandwidth: the bandwidth requirement you have in KHz, if you do not have one
- *      you can set this to 0. If this frequency is allowed we then set
- *      this value to the maximum allowed bandwidth.
+ * @desired_bw_khz: the desired max bandwidth you want to use per
+ *      channel. Note that this is still 20 MHz if you want to use HT40
+ *      as HT40 makes use of two channels for its 40 MHz width bandwidth.
+ *      If set to 0 we'll assume you want the standard 20 MHz.
  * @reg_rule: the regulatory rule which we have for this frequency
  *
  * Use this function to get the regulatory rule for a specific frequency on
@@ -1320,7 +1372,9 @@ extern void wiphy_apply_custom_regulatory(
  * freq_in_rule_band() for our current definition of a band -- this is purely
  * subjective and right now its 802.11 specific.
  */
-extern int freq_reg_info(struct wiphy *wiphy, u32 center_freq, u32 *bandwidth,
+extern int freq_reg_info(struct wiphy *wiphy,
+                         u32 center_freq,
+                         u32 desired_bw_khz,
                          const struct ieee80211_reg_rule **reg_rule);
 
 /*
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index d10ed1776fcd..d72346ff3247 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -173,7 +173,6 @@ enum ieee80211_bss_change {
  * @timestamp: beacon timestamp
  * @beacon_int: beacon interval
  * @assoc_capability: capabilities taken from assoc resp
- * @ht: BSS's HT configuration
  * @basic_rates: bitmap of basic rates, each bit stands for an
  *      index into the rate table configured by the driver in
  *      the current band.
@@ -673,16 +672,6 @@ enum ieee80211_key_alg {
 };
 
 /**
- * enum ieee80211_key_len - key length
- * @LEN_WEP40: WEP 5-byte long key
- * @LEN_WEP104: WEP 13-byte long key
- */
-enum ieee80211_key_len {
-        LEN_WEP40 = 5,
-        LEN_WEP104 = 13,
-};
-
-/**
  * enum ieee80211_key_flags - key flags
  *
  * These flags are used for communication about keys between the driver
@@ -1813,24 +1802,6 @@ struct sk_buff *
 ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
 
 /**
- * ieee80211_get_hdrlen_from_skb - get header length from data
- *
- * Given an skb with a raw 802.11 header at the data pointer this function
- * returns the 802.11 header length in bytes (not including encryption
- * headers). If the data in the sk_buff is too short to contain a valid 802.11
- * header the function returns 0.
- *
- * @skb: the frame
- */
-unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
-
-/**
- * ieee80211_hdrlen - get header length in bytes from frame control
- * @fc: frame control field in little-endian format
- */
-unsigned int ieee80211_hdrlen(__le16 fc);
-
-/**
  * ieee80211_get_tkip_key - get a TKIP rc4 for skb
  *
  * This function computes a TKIP rc4 key for an skb. It computes