Commit 5933f2ae 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: (47 commits)
  sysctl: net: call unregister_net_sysctl_table where needed
  Revert: veth: remove unneeded ifname code from veth_newlink()
  smsc95xx: fix reset check
  tg3: Fix failure to enable WoL by default when possible
  networking: inappropriate ioctl operation should return ENOTTY
  amd8111e: trivial typo spelling: Negotitate -> Negotiate
  ipv4: don't spam dmesg with "Using LC-trie" messages
  af_unix: Only allow recv on connected seqpacket sockets.
  mii: add support of pause frames in mii_get_an
  net: ftmac100: fix scheduling while atomic during PHY link status change
  usbnet: Transfer of maintainership
  usbnet: add support for some Huawei modems with cdc-ether ports
  bnx2: cancel timer on device removal
  iwl4965: fix "Received BA when not expected"
  iwlagn: fix "Received BA when not expected"
  dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085
  usbnet: Resubmit interrupt URB if device is open
  iwl4965: fix "TX Power requested while scanning"
  iwlegacy: led stay solid on when no traffic
  b43: trivial: update module info about ucode16_mimo firmware
  ...
parents adadfe48 ff538818

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6556,7 +6556,7 @@ S: Maintained 
F:	drivers/usb/host/uhci*



USB "USBNET" DRIVER FRAMEWORK

M:	David Brownell <dbrownell@users.sourceforge.net>

M:	Oliver Neukum <oneukum@suse.de>

L:	netdev@vger.kernel.org

W:	http://www.linux-usb.org/usbnet

S:	Maintained

arch/powerpc/include/asm/8xx_immap.h

+2 −2
Original line number Diff line number Diff line
@@ -393,8 +393,8 @@ typedef struct fec { 
	uint	fec_addr_low;		/* lower 32 bits of station address	*/

	ushort	fec_addr_high;		/* upper 16 bits of station address	*/

	ushort	res1;			/* reserved				*/

	uint	fec_hash_table_high;	/* upper 32-bits of hash table		*/

	uint	fec_hash_table_low;	/* lower 32-bits of hash table		*/

	uint	fec_grp_hash_table_high;	/* upper 32-bits of hash table		*/

	uint	fec_grp_hash_table_low;	/* lower 32-bits of hash table		*/

	uint	fec_r_des_start;	/* beginning of Rx descriptor ring	*/

	uint	fec_x_des_start;	/* beginning of Tx descriptor ring	*/

	uint	fec_r_buff_size;	/* Rx buffer size			*/

drivers/net/amd8111e.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version "M 
MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl);

module_param_array(speed_duplex, int, NULL, 0);

MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotitate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex");

MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotiate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex");

module_param_array(coalesce, bool, NULL, 0);

MODULE_PARM_DESC(coalesce, "Enable or Disable interrupt coalescing, 1: Enable, 0: Disable");

module_param_array(dynamic_ipg, bool, NULL, 0);

drivers/net/atl1c/atl1c.h

+3 −3
Original line number Diff line number Diff line
@@ -566,9 +566,9 @@ struct atl1c_adapter { 
#define __AT_TESTING        0x0001

#define __AT_RESETTING      0x0002

#define __AT_DOWN           0x0003

	u8 work_event;

#define ATL1C_WORK_EVENT_RESET 		0x01

#define ATL1C_WORK_EVENT_LINK_CHANGE	0x02

	unsigned long work_event;

#define	ATL1C_WORK_EVENT_RESET		0

#define	ATL1C_WORK_EVENT_LINK_CHANGE	1

	u32 msg_enable;



	bool have_msi;

drivers/net/atl1c/atl1c_main.c

+5 −9
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static void atl1c_link_chg_event(struct atl1c_adapter *adapter) 
		}

	}



	adapter->work_event |= ATL1C_WORK_EVENT_LINK_CHANGE;

	set_bit(ATL1C_WORK_EVENT_LINK_CHANGE, &adapter->work_event);

	schedule_work(&adapter->common_task);

}
@@ -337,21 +337,17 @@ static void atl1c_common_task(struct work_struct *work) 
	adapter = container_of(work, struct atl1c_adapter, common_task);

	netdev = adapter->netdev;



	if (adapter->work_event & ATL1C_WORK_EVENT_RESET) {

		adapter->work_event &= ~ATL1C_WORK_EVENT_RESET;

	if (test_and_clear_bit(ATL1C_WORK_EVENT_RESET, &adapter->work_event)) {

		netif_device_detach(netdev);

		atl1c_down(adapter);

		atl1c_up(adapter);

		netif_device_attach(netdev);

		return;

	}



	if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE) {

		adapter->work_event &= ~ATL1C_WORK_EVENT_LINK_CHANGE;

	if (test_and_clear_bit(ATL1C_WORK_EVENT_LINK_CHANGE,

		&adapter->work_event))

		atl1c_check_link_status(adapter);

}

	return;

}





static void atl1c_del_timer(struct atl1c_adapter *adapter)
@@ -369,7 +365,7 @@ static void atl1c_tx_timeout(struct net_device *netdev) 
	struct atl1c_adapter *adapter = netdev_priv(netdev);



	/* Do the reset outside of interrupt context */

	adapter->work_event |= ATL1C_WORK_EVENT_RESET;

	set_bit(ATL1C_WORK_EVENT_RESET, &adapter->work_event);

	schedule_work(&adapter->common_task);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE