Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e63e0327 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: (78 commits)
  AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
  pktgen: mac count
  pktgen: random flow 
  bridge: Eliminate unnecessary forward delay
  bridge: fix compile warning in net/bridge/br_netfilter.c
  ipv4: remove unused field in struct flowi (include/net/flow.h).
  tg3: Fix 'scheduling while atomic' errors
  net: Kill plain NET_XMIT_BYPASS.
  net_sched: Add qdisc __NET_XMIT_BYPASS flag
  net_sched: Add qdisc __NET_XMIT_STOLEN flag
  iwl3945: fix merge mistake for packet injection
  iwlwifi: grap nic access before accessing periphery registers
  iwlwifi: decrement rx skb counter in scan abort handler
  iwlwifi: fix unhandled interrupt when HW rfkill is on
  iwlwifi: implement iwl5000_calc_rssi
  iwlwifi: memory allocation optimization
  iwlwifi: HW bug fixes
  p54: Fix potential concurrent access to private data
  rt2x00: Disable link tuning in rt2500usb
  iwlwifi: Don't use buffer allocated on the stack for led names
  ...
parents 37193fb4 ffb20847

drivers/net/tg3.c

+4 −16
Original line number Diff line number Diff line
@@ -7687,21 +7687,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
 */

static int tg3_init_hw(struct tg3 *tp, int reset_phy)

{

	int err;



	/* Force the chip into D0. */

	err = tg3_set_power_state(tp, PCI_D0);

	if (err)

		goto out;



	tg3_switch_clocks(tp);



	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);



	err = tg3_reset_hw(tp, reset_phy);



out:

	return err;

	return tg3_reset_hw(tp, reset_phy);

}



#define TG3_STAT_ADD32(PSTAT, REG) \
@@ -8016,13 +8006,11 @@ static int tg3_open(struct net_device *dev) 


	netif_carrier_off(tp->dev);



	tg3_full_lock(tp, 0);



	err = tg3_set_power_state(tp, PCI_D0);

	if (err) {

		tg3_full_unlock(tp);

	if (err)

		return err;

	}



	tg3_full_lock(tp, 0);



	tg3_disable_ints(tp);

	tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ config RTL8187 
	  Trendnet TEW-424UB

	  ASUS P5B Deluxe

	  Toshiba Satellite Pro series of laptops

	  Asus Wireless Link



	  Thanks to Realtek for their support!

drivers/net/wireless/ath5k/ath5k.h

+5 −3
Original line number Diff line number Diff line
@@ -186,11 +186,13 @@ struct ath5k_srev_name { 
#define AR5K_SREV_RAD_2111	0x20

#define AR5K_SREV_RAD_5112	0x30

#define AR5K_SREV_RAD_5112A	0x35

#define	AR5K_SREV_RAD_5112B	0x36

#define AR5K_SREV_RAD_2112	0x40

#define AR5K_SREV_RAD_2112A	0x45

#define AR5K_SREV_RAD_SC0	0x56	/* Found on 2413/2414 */

#define AR5K_SREV_RAD_SC1	0x63	/* Found on 5413/5414 */

#define AR5K_SREV_RAD_SC2	0xa2	/* Found on 2424-5/5424 */

#define	AR5K_SREV_RAD_2112B	0x46

#define AR5K_SREV_RAD_SC0	0x50	/* Found on 2413/2414 */

#define AR5K_SREV_RAD_SC1	0x60	/* Found on 5413/5414 */

#define AR5K_SREV_RAD_SC2	0xa0	/* Found on 2424-5/5424 */

#define AR5K_SREV_RAD_5133	0xc0	/* MIMO found on 5418 */



/* IEEE defs */

drivers/net/wireless/ath5k/base.c

+1 −0
Original line number Diff line number Diff line
@@ -2170,6 +2170,7 @@ ath5k_beacon_config(struct ath5k_softc *sc) 


	ath5k_hw_set_intr(ah, 0);

	sc->bmisscount = 0;

	sc->imask &= ~(AR5K_INT_BMISS | AR5K_INT_SWBA);



	if (sc->opmode == IEEE80211_IF_TYPE_STA) {

		sc->imask |= AR5K_INT_BMISS;

drivers/net/wireless/ath5k/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct reg regs[] = { 
	REG_STRUCT_INIT(AR5K_CPC1),

	REG_STRUCT_INIT(AR5K_CPC2),

	REG_STRUCT_INIT(AR5K_CPC3),

	REG_STRUCT_INIT(AR5K_CPCORN),

	REG_STRUCT_INIT(AR5K_CPCOVF),

	REG_STRUCT_INIT(AR5K_RESET_CTL),

	REG_STRUCT_INIT(AR5K_SLEEP_CTL),

	REG_STRUCT_INIT(AR5K_INTPEND),