Commit d89b218b 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: (108 commits)
  bridge: ensure to unlock in error path in br_multicast_query().
  drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages
  sky2: Avoid rtnl_unlock without rtnl_lock
  ipv6: Send netlink notification when DAD fails
  drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant
  ipconfig: Handle devices which take some time to come up.
  mac80211: Fix memory leak in ieee80211_if_write()
  mac80211: Fix (dynamic) power save entry
  ipw2200: use kmalloc for large local variables
  ath5k: read eeprom IQ calibration values correctly for G mode
  ath5k: fix I/Q calibration (for real)
  ath5k: fix TSF reset
  ath5k: use fixed antenna for tx descriptors
  libipw: split ieee->networks into small pieces
  mac80211: Fix sta_mtx unlocking on insert STA failure path
  rt2x00: remove KSEG1ADDR define from rt2x00soc.h
  net: add ColdFire support to the smc91x driver
  asix: fix setting mac address for AX88772
  ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}.
  net: Fix dev_mc_add()
  ...
parents 80a18607 bec68ff1

MAINTAINERS

+16 −5
Original line number Diff line number Diff line
@@ -1405,20 +1405,30 @@ F: arch/x86/include/asm/calgary.h 
F:	arch/x86/include/asm/tce.h



CAN NETWORK LAYER

M:	Urs Thuermann <urs.thuermann@volkswagen.de>

M:	Oliver Hartkopp <socketcan@hartkopp.net>

M:	Oliver Hartkopp <oliver.hartkopp@volkswagen.de>

L:	socketcan-core@lists.berlios.de (subscribers-only)

M:	Urs Thuermann <urs.thuermann@volkswagen.de>

L:	socketcan-core@lists.berlios.de

L:	netdev@vger.kernel.org

W:	http://developer.berlios.de/projects/socketcan/

S:	Maintained

F:	drivers/net/can/

F:	include/linux/can/

F:	net/can/

F:	include/linux/can.h

F:	include/linux/can/core.h

F:	include/linux/can/bcm.h

F:	include/linux/can/raw.h



CAN NETWORK DRIVERS

M:	Wolfgang Grandegger <wg@grandegger.com>

L:	socketcan-core@lists.berlios.de (subscribers-only)

L:	socketcan-core@lists.berlios.de

L:	netdev@vger.kernel.org

W:	http://developer.berlios.de/projects/socketcan/

S:	Maintained

F:	drivers/net/can/

F:	include/linux/can/dev.h

F:	include/linux/can/error.h

F:	include/linux/can/netlink.h

F:	include/linux/can/platform/



CELL BROADBAND ENGINE ARCHITECTURE

M:	Arnd Bergmann <arnd@arndb.de>
@@ -2130,6 +2140,7 @@ F: drivers/net/eexpress.* 
ETHERNET BRIDGE

M:	Stephen Hemminger <shemminger@linux-foundation.org>

L:	bridge@lists.linux-foundation.org

L:	netdev@vger.kernel.org

W:	http://www.linux-foundation.org/en/Net:Bridge

S:	Maintained

F:	include/linux/netfilter_bridge/

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ config SMC91X 
	select CRC32

	select MII

	depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \

		MIPS || BLACKFIN || MN10300

		MIPS || BLACKFIN || MN10300 || COLDFIRE

	help

	  This is a driver for SMC's 91x series of Ethernet chipsets,

	  including the SMC91C94 and the SMC91C111. Say Y if you want it

drivers/net/arm/ks8695net.c

+1 −1
Original line number Diff line number Diff line
@@ -575,9 +575,9 @@ static int ks8695_poll(struct napi_struct *napi, int budget) 
	if (work_done < budget) {

		unsigned long flags;

		spin_lock_irqsave(&ksp->rx_lock, flags);

		__napi_complete(napi);

		/*enable rx interrupt*/

		writel(isr | mask_bit, KS8695_IRQ_VA + KS8695_INTEN);

		__napi_complete(napi);

		spin_unlock_irqrestore(&ksp->rx_lock, flags);

	}

	return work_done;

drivers/net/benet/be.h

+0 −5
Original line number Diff line number Diff line
@@ -290,11 +290,6 @@ extern const struct ethtool_ops be_ethtool_ops; 


#define drvr_stats(adapter)		(&adapter->stats.drvr_stats)



static inline unsigned int be_pci_func(struct be_adapter *adapter)

{

	return PCI_FUNC(adapter->pdev->devfn);

}



#define BE_SET_NETDEV_OPS(netdev, ops)	(netdev->netdev_ops = ops)



#define PAGE_SHIFT_4K		12

drivers/net/benet/be_cmds.c

+0 −6
Original line number Diff line number Diff line
@@ -465,8 +465,6 @@ int be_cmd_eq_create(struct be_adapter *adapter, 


	req->num_pages =  cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));



	AMAP_SET_BITS(struct amap_eq_context, func, req->context,

			be_pci_func(adapter));

	AMAP_SET_BITS(struct amap_eq_context, valid, req->context, 1);

	/* 4byte eqe*/

	AMAP_SET_BITS(struct amap_eq_context, size, req->context, 0);
@@ -629,7 +627,6 @@ int be_cmd_cq_create(struct be_adapter *adapter, 
	AMAP_SET_BITS(struct amap_cq_context, eventable, ctxt, 1);

	AMAP_SET_BITS(struct amap_cq_context, eqid, ctxt, eq->id);

	AMAP_SET_BITS(struct amap_cq_context, armed, ctxt, 1);

	AMAP_SET_BITS(struct amap_cq_context, func, ctxt, be_pci_func(adapter));

	be_dws_cpu_to_le(ctxt, sizeof(req->context));



	be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem);
@@ -678,7 +675,6 @@ int be_cmd_mccq_create(struct be_adapter *adapter, 


	req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size);



	AMAP_SET_BITS(struct amap_mcc_context, fid, ctxt, be_pci_func(adapter));

	AMAP_SET_BITS(struct amap_mcc_context, valid, ctxt, 1);

	AMAP_SET_BITS(struct amap_mcc_context, ring_size, ctxt,

		be_encoded_q_len(mccq->len));
@@ -727,8 +723,6 @@ int be_cmd_txq_create(struct be_adapter *adapter, 


	AMAP_SET_BITS(struct amap_tx_context, tx_ring_size, ctxt,

		be_encoded_q_len(txq->len));

	AMAP_SET_BITS(struct amap_tx_context, pci_func_id, ctxt,

			be_pci_func(adapter));

	AMAP_SET_BITS(struct amap_tx_context, ctx_valid, ctxt, 1);

	AMAP_SET_BITS(struct amap_tx_context, cq_id_send, ctxt, cq->id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE