Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/usb/qmi_wwan.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
	include/net/netfilter/nf_conntrack_synproxy.h
	include/net/secure_seq.h

The conflicts are of two varieties:

1) Conflicts with Joe Perches's 'extern' removal from header file
   function declarations.  Usually it's an argument signature change
   or a function being added/removed.  The resolutions are trivial.

2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
   a new value, another changes an existing value.  That sort of
   thing.

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

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/can/flexcan.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be.h
index 21b064feaa4e17e0f4790311e1a904a8a0a3e1ea,db020230bd0bba5ec72186bed9539357ec315abc..add6d7a953c6a0ad425a3a0b471698c13b768b11
--- 1/drivers/net/ethernet/emulex/benet/be.h
--- 2/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@@ -88,7 -88,8 +88,8 @@@ static inline char *nic_name(struct pci
  #define BE_MIN_MTU            256
  
  #define BE_NUM_VLANS_SUPPORTED        64
 -#define BE_MAX_EQD            96u
+ #define BE_UMC_NUM_VLANS_SUPPORTED    15
 +#define BE_MAX_EQD            128u
  #define       BE_MAX_TX_FRAG_COUNT    30
  
  #define EVNT_Q_LEN            1024

diff --cc drivers/net/ethernet/emulex/benet/be_cmds.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_cmds.h
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_ethtool.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
index 0e59f9e4498b6a9a06a3d70750031936ba389cae,3d6aaf79d8b2399565b4e9c1a64edd4fe27b90af..d03b6b6c64c0baaa925714b88847861a5313981e
--- 1/drivers/net/usb/qmi_wwan.c
--- 2/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@@ -729,8 -714,7 +729,8 @@@ static const struct usb_device_id produ
        {QMI_FIXED_INTF(0x2357, 0x0201, 4)},    /* TP-LINK HSUPA Modem MA180 */
        {QMI_FIXED_INTF(0x2357, 0x9000, 4)},    /* TP-LINK MA260 */
        {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},    /* Telit LE920 */
-       {QMI_FIXED_INTF(0x1e2d, 0x12d1, 4)},    /* Cinterion PLxx */
 +      {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)},    /* Telit LE920 */
+       {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)},    /* Cinterion PLxx */
  
        /* 4. Gobi 1000 devices */
        {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},    /* Acer Gobi Modem Device */

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index 5bc02768587a1129b9b2ed12cdcc23b287dfd439,74156f84180ca19b87df7ff244358f0ab830dab3..7f1340d03f18690fd08ab52c545cc8530a3c6de8
--- 1/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
--- 2/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@@ -132,33 -132,35 +132,34 @@@ struct pktq *brcmf_bus_gettxq(struct br
   * interface functions from common layer
   */
  
 -extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,
 -                       struct sk_buff *pkt, int prec);
 +bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, struct sk_buff *pkt,
 +                    int prec);
  
  /* Receive frame for delivery to OS.  Callee disposes of rxp. */
 -extern void brcmf_rx_frames(struct device *dev, struct sk_buff_head *rxlist);
 +void brcmf_rx_frames(struct device *dev, struct sk_buff_head *rxlist);
  
  /* Indication from bus module regarding presence/insertion of dongle. */
 -extern int brcmf_attach(uint bus_hdrlen, struct device *dev);
 +int brcmf_attach(uint bus_hdrlen, struct device *dev);
  /* Indication from bus module regarding removal/absence of dongle */
 -extern void brcmf_detach(struct device *dev);
 +void brcmf_detach(struct device *dev);
  /* Indication from bus module that dongle should be reset */
 -extern void brcmf_dev_reset(struct device *dev);
 +void brcmf_dev_reset(struct device *dev);
  /* Indication from bus module to change flow-control state */
 -extern void brcmf_txflowblock(struct device *dev, bool state);
 +void brcmf_txflowblock(struct device *dev, bool state);
  
  /* Notify the bus has transferred the tx packet to firmware */
 -extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp,
 -                           bool success);
 +void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success);
  
 -extern int brcmf_bus_start(struct device *dev);
 +int brcmf_bus_start(struct device *dev);
  
  #ifdef CONFIG_BRCMFMAC_SDIO
 -extern void brcmf_sdio_exit(void);
 -extern void brcmf_sdio_init(void);
 -extern void brcmf_sdio_register(void);
 +void brcmf_sdio_exit(void);
 +void brcmf_sdio_init(void);
++void brcmf_sdio_register(void);
  #endif
  #ifdef CONFIG_BRCMFMAC_USB
 -extern void brcmf_usb_exit(void);
 -extern void brcmf_usb_register(void);
 +void brcmf_usb_exit(void);
- void brcmf_usb_init(void);
++void brcmf_usb_register(void);
  #endif
  
  #endif                                /* _BRCMF_BUS_H_ */

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/ip_vs.h
Simple merge

diff --cc include/net/mrp.h
Simple merge

diff --cc include/net/net_namespace.h
Simple merge

diff --cc include/net/netfilter/nf_conntrack_synproxy.h
index 968186642bb163e79eedbe08d547b32c9292159d,f572f313d6f1e0d7ae61f345b9aeb15a7dfea0a2..6793614e6502a0eb51ca7efabc593e7bb6866576
--- 1/include/net/netfilter/nf_conntrack_synproxy.h
--- 2/include/net/netfilter/nf_conntrack_synproxy.h
+++ b/include/net/netfilter/nf_conntrack_synproxy.h
@@@ -56,20 -56,22 +56,20 @@@ struct synproxy_options 
  
  struct tcphdr;
  struct xt_synproxy_info;
- void synproxy_parse_options(const struct sk_buff *skb, unsigned int doff,
 -extern bool synproxy_parse_options(const struct sk_buff *skb, unsigned int doff,
 -                                 const struct tcphdr *th,
 -                                 struct synproxy_options *opts);
 -extern unsigned int synproxy_options_size(const struct synproxy_options *opts);
 -extern void synproxy_build_options(struct tcphdr *th,
 -                                 const struct synproxy_options *opts);
++bool synproxy_parse_options(const struct sk_buff *skb, unsigned int doff,
 +                          const struct tcphdr *th,
 +                          struct synproxy_options *opts);
 +unsigned int synproxy_options_size(const struct synproxy_options *opts);
 +void synproxy_build_options(struct tcphdr *th,
 +                          const struct synproxy_options *opts);
  
 -extern void synproxy_init_timestamp_cookie(const struct xt_synproxy_info *info,
 -                                         struct synproxy_options *opts);
 -extern void synproxy_check_timestamp_cookie(struct synproxy_options *opts);
 +void synproxy_init_timestamp_cookie(const struct xt_synproxy_info *info,
 +                                  struct synproxy_options *opts);
 +void synproxy_check_timestamp_cookie(struct synproxy_options *opts);
  
 -extern unsigned int synproxy_tstamp_adjust(struct sk_buff *skb,
 -                                         unsigned int protoff,
 -                                         struct tcphdr *th,
 -                                         struct nf_conn *ct,
 -                                         enum ip_conntrack_info ctinfo,
 -                                         const struct nf_conn_synproxy *synproxy);
 +unsigned int synproxy_tstamp_adjust(struct sk_buff *skb, unsigned int protoff,
 +                                  struct tcphdr *th, struct nf_conn *ct,
 +                                  enum ip_conntrack_info ctinfo,
 +                                  const struct nf_conn_synproxy *synproxy);
  
  #endif /* _NF_CONNTRACK_SYNPROXY_H */

diff --cc include/net/secure_seq.h
index 52c1a906f28837c71719dd4a0f7eae1a1dee453a,c2e542b27a5a8316f3b105b2338bc96d5698690e..f257486f17be4bed528826544359c569e6a4b2dd
--- 1/include/net/secure_seq.h
--- 2/include/net/secure_seq.h
+++ b/include/net/secure_seq.h
@@@ -3,19 -3,18 +3,18 @@@
  
  #include <linux/types.h>
  
- void net_secret_init(void);
 -extern __u32 secure_ip_id(__be32 daddr);
 -extern __u32 secure_ipv6_id(const __be32 daddr[4]);
 -extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
 -extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
 -                                    __be16 dport);
 -extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
 -                                      __be16 sport, __be16 dport);
 -extern __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr,
 -                                        __be16 sport, __be16 dport);
 -extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
 -                                     __be16 sport, __be16 dport);
 -extern u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
 -                                       __be16 sport, __be16 dport);
 +__u32 secure_ip_id(__be32 daddr);
 +__u32 secure_ipv6_id(const __be32 daddr[4]);
 +u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
 +u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
 +                             __be16 dport);
 +__u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
 +                               __be16 sport, __be16 dport);
 +__u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr,
 +                                 __be16 sport, __be16 dport);
 +u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
 +                              __be16 sport, __be16 dport);
 +u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
 +                                __be16 sport, __be16 dport);
  
  #endif /* _NET_SECURE_SEQ */

diff --cc include/net/sock.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/raw.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge