From: David S. Miller <davem@davemloft.net>
Date: Tue, 23 Sep 2014 16:09:27 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1f6d80358dc9bbbeb56cb43384fa11fd645d9289;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

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

1f6d80358dc9bbbeb56cb43384fa11fd645d9289
diff --cc drivers/net/can/flexcan.c
index 2700865efcad,6586309329e6..60f86bd0434a
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -858,8 -823,9 +882,8 @@@ static int flexcan_chip_start(struct ne
  {
  	struct flexcan_priv *priv = netdev_priv(dev);
  	struct flexcan_regs __iomem *regs = priv->base;
--	int err;
 -	u32 reg_mcr, reg_ctrl;
 -	int i;
 +	u32 reg_mcr, reg_ctrl, reg_crl2, reg_mecr;
++	int err, i;
  
  	/* enable module */
  	err = flexcan_chip_enable(priv);
diff --cc drivers/net/ethernet/arc/emac_main.c
index dbea8472bfb4,5919394d9f58..abe1eabc0171
--- a/drivers/net/ethernet/arc/emac_main.c
+++ b/drivers/net/ethernet/arc/emac_main.c
@@@ -26,7 -26,20 +26,18 @@@
  
  #include "emac.h"
  
 -#define DRV_NAME	"arc_emac"
 -#define DRV_VERSION	"1.0"
  
+ /**
+  * arc_emac_tx_avail - Return the number of available slots in the tx ring.
+  * @priv: Pointer to ARC EMAC private data structure.
+  *
+  * returns: the number of slots available for transmission in tx the ring.
+  */
+ static inline int arc_emac_tx_avail(struct arc_emac_priv *priv)
+ {
+ 	return (priv->txbd_dirty + TX_BD_NUM - priv->txbd_curr - 1) % TX_BD_NUM;
+ }
+ 
  /**
   * arc_emac_adjust_link - Adjust the PHY link duplex.
   * @ndev:	Pointer to the net_device structure.
diff --cc include/net/addrconf.h
index 9b1d42e66cca,ec51e673b4b6..d13573bb879e
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@@ -202,8 -202,9 +202,9 @@@ int ipv6_sock_ac_drop(struct sock *sk, 
  		      const struct in6_addr *addr);
  void ipv6_sock_ac_close(struct sock *sk);
  
 -int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr);
 +int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr);
  int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);
+ void ipv6_ac_destroy_dev(struct inet6_dev *idev);
  bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
  			 const struct in6_addr *addr);
  bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev,