Commit e864561c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (29 commits)
  cxgb3: Fix crash caused by stashing wrong netdev_queue
  ixgbe: Fix coexistence of FCoE and Flow Director in 82599
  memory barrier: adding smp_mb__after_lock
  net: adding memory barrier to the poll and receive callbacks
  netpoll: Fix carrier detection for drivers that are using phylib
  includecheck fix: include/linux, rfkill.h
  p54: tx refused but queue active
  Atheros Kconfig needs to be dependent on WLAN_80211
  mac80211: fix docbook
  mac80211_hwsim: avoid NULL access
  ssb: Add support for 4318E
  b43: Add support for 4318E
  zd1211rw: adding SONY IFU-WLM2 (054c:0257) as a zd1211b device
  zd1211rw: 07b8:6001 is a ZD1211B
  r6040: bump driver version to 0.24 and date to 08 July 2009
  r6040: restore MIER register correctly when IRQ line is shared
  ipv4: Fix fib_trie rebalancing, part 4 (root thresholds)
  davinci_emac: fix kernel oops when changing MAC address while interface is down
  igb: set lan id prior to configuring phy
  mac80211: minstrel: avoid accessing negative indices in rix_to_ndx()
  ...
parents 42359da4 e594e96e

Documentation/DocBook/mac80211.tmpl

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_ctstoself_get

!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb

!Finclude/net/mac80211.h ieee80211_hdrlen

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_wake_queues

arch/x86/include/asm/spinlock.h

+4 −0
Original line number Diff line number Diff line
@@ -302,4 +302,8 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw) 
#define _raw_read_relax(lock)	cpu_relax()

#define _raw_write_relax(lock)	cpu_relax()



/* The {read|write|spin}_lock() on x86 are full memory barriers. */

static inline void smp_mb__after_lock(void) { }

#define ARCH_HAS_SMP_MB_AFTER_LOCK



#endif /* _ASM_X86_SPINLOCK_H */

drivers/net/cxgb3/cxgb3_main.c

+1 −2
Original line number Diff line number Diff line
@@ -642,8 +642,7 @@ static int setup_sge_qsets(struct adapter *adap) 
		struct port_info *pi = netdev_priv(dev);



		pi->qs = &adap->sge.qs[pi->first_qset];

		for (j = pi->first_qset; j < pi->first_qset + pi->nqsets;

		     ++j, ++qset_idx) {

		for (j = 0; j < pi->nqsets; ++j, ++qset_idx) {

			set_qset_lro(dev, qset_idx, pi->rx_offload & T3_LRO);

			err = t3_sge_alloc_qset(adap, qset_idx, 1,

				(adap->flags & USING_MSIX) ? qset_idx + 1 :

drivers/net/davinci_emac.c

+10 −2
Original line number Diff line number Diff line
@@ -1820,11 +1820,19 @@ static int emac_dev_setmac_addr(struct net_device *ndev, void *addr) 
	struct device *emac_dev = &priv->ndev->dev;

	struct sockaddr *sa = addr;



	if (!is_valid_ether_addr(sa->sa_data))

		return -EINVAL;



	/* Store mac addr in priv and rx channel and set it in EMAC hw */

	memcpy(priv->mac_addr, sa->sa_data, ndev->addr_len);

	memcpy(rxch->mac_addr, sa->sa_data, ndev->addr_len);

	memcpy(ndev->dev_addr, sa->sa_data, ndev->addr_len);



	/* If the interface is down - rxch is NULL. */

	/* MAC address is configured only after the interface is enabled. */

	if (netif_running(ndev)) {

		memcpy(rxch->mac_addr, sa->sa_data, ndev->addr_len);

		emac_setmac(priv, EMAC_DEF_RX_CH, rxch->mac_addr);

	}



	if (netif_msg_drv(priv))

		dev_notice(emac_dev, "DaVinci EMAC: emac_dev_setmac_addr %pM\n",

drivers/net/fec.h

+6 −6
Original line number Diff line number Diff line
@@ -46,12 +46,12 @@ 


#else



#define FEC_ECNTRL;		0x000 /* Ethernet control reg */

#define FEC_IEVENT;		0x004 /* Interrupt even reg */

#define FEC_IMASK;		0x008 /* Interrupt mask reg */

#define FEC_IVEC;		0x00c /* Interrupt vec status reg */

#define FEC_R_DES_ACTIVE;	0x010 /* Receive descriptor reg */

#define FEC_X_DES_ACTIVE;	0x01c /* Transmit descriptor reg */

#define FEC_ECNTRL		0x000 /* Ethernet control reg */

#define FEC_IEVENT		0x004 /* Interrupt even reg */

#define FEC_IMASK		0x008 /* Interrupt mask reg */

#define FEC_IVEC		0x00c /* Interrupt vec status reg */

#define FEC_R_DES_ACTIVE	0x010 /* Receive descriptor reg */

#define FEC_X_DES_ACTIVE	0x014 /* Transmit descriptor reg */

#define FEC_MII_DATA		0x040 /* MII manage frame reg */

#define FEC_MII_SPEED		0x044 /* MII speed control reg */

#define FEC_R_BOUND		0x08c /* FIFO receive bound reg */

CRA Git | Maintained and supported by SUSTech CRA and CCSE