Commit 609eb39c 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)
  [SCTP]: Fix local_addr deletions during list traversals.
  net: fix build with CONFIG_NET=n
  [TCP]: Prevent sending past receiver window with TSO (at last skb)
  rt2x00: Add new D-Link USB ID
  rt2x00: never disable multicast because it disables broadcast too
  libertas: fix the 'compare command with itself' properly
  drivers/net/Kconfig: fix whitespace for GELIC_WIRELESS entry
  [NETFILTER]: nf_queue: don't return error when unregistering a non-existant handler
  [NETFILTER]: nfnetlink_queue: fix EPERM when binding/unbinding and instance 0 exists
  [NETFILTER]: nfnetlink_log: fix EPERM when binding/unbinding and instance 0 exists
  [NETFILTER]: nf_conntrack: replace horrible hack with ksize()
  [NETFILTER]: nf_conntrack: add \n to "expectation table full" message
  [NETFILTER]: xt_time: fix failure to match on Sundays
  [NETFILTER]: nfnetlink_log: fix computation of netlink skb size
  [NETFILTER]: nfnetlink_queue: fix computation of allocated size for netlink skb.
  [NETFILTER]: nfnetlink: fix ifdef in nfnetlink_compat.h
  [NET]: include <linux/types.h> into linux/ethtool.h for __u* typedef
  [NET]: Make /proc/net a symlink on /proc/self/net (v3)
  RxRPC: fix rxrpc_recvmsg()'s returning of msg_name
  net/enc28j60: oops fix
  ...
parents 123d43ac 22626216

MAINTAINERS

+4 −28
Original line number Diff line number Diff line
@@ -2052,43 +2052,19 @@ M: kernel@wantstofly.org 
L:	netdev@vger.kernel.org

S:	Maintained



INTEL PRO/100 ETHERNET SUPPORT

INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

P:	Jesse Brandeburg

M:	jesse.brandeburg@intel.com

P:	Jeff Kirsher

M:	jeffrey.t.kirsher@intel.com

P:	Bruce Allan

M:	bruce.w.allan@intel.com

P:	John Ronciak

M:	john.ronciak@intel.com

L:	e1000-devel@lists.sourceforge.net

W:	http://sourceforge.net/projects/e1000/

S:	Supported



INTEL PRO/1000 GIGABIT ETHERNET SUPPORT

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

P:	Jesse Brandeburg

M:	jesse.brandeburg@intel.com

P:	Jeff Kirsher

M:	jeffrey.t.kirsher@intel.com

P:	John Ronciak

M:	john.ronciak@intel.com

L:	e1000-devel@lists.sourceforge.net

W:	http://sourceforge.net/projects/e1000/

S:	Supported



INTEL PRO/10GbE SUPPORT

P:	Ayyappan Veeraiyan

M:	ayyappan.veeraiyan@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

P:	Jesse Brandeburg

M:	jesse.brandeburg@intel.com

P:	John Ronciak

M:	john.ronciak@intel.com

L:	e1000-devel@lists.sourceforge.net

W:	http://sourceforge.net/projects/e1000/

W:	http://e1000.sourceforge.net/

S:	Supported



INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT

drivers/atm/firestream.c

+2 −2
Original line number Diff line number Diff line
@@ -331,8 +331,8 @@ module_param(fs_keystream, int, 0); 
#define FS_DEBUG_QSIZE   0x00001000





#define func_enter() fs_dprintk (FS_DEBUG_FLOW, "fs: enter %s\n", __FUNCTION__)

#define func_exit()  fs_dprintk (FS_DEBUG_FLOW, "fs: exit  %s\n", __FUNCTION__)

#define func_enter() fs_dprintk(FS_DEBUG_FLOW, "fs: enter %s\n", __func__)

#define func_exit()  fs_dprintk(FS_DEBUG_FLOW, "fs: exit  %s\n", __func__)





static struct fs_dev *fs_boards = NULL;

drivers/atm/fore200e.c

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ 
#if 1

#define ASSERT(expr)     if (!(expr)) { \

			     printk(FORE200E "assertion failed! %s[%d]: %s\n", \

				    __FUNCTION__, __LINE__, #expr); \

			     panic(FORE200E "%s", __FUNCTION__); \

				    __func__, __LINE__, #expr); \

			     panic(FORE200E "%s", __func__); \

			 }

#else

#define ASSERT(expr)     do {} while (0)

drivers/atm/idt77252.c

+6 −6
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ idt77252_tx_dump(struct idt77252_dev *card) 
	struct vc_map *vc;

	int i;



	printk("%s\n", __FUNCTION__);

	printk("%s\n", __func__);

	for (i = 0; i < card->tct_size; i++) {

		vc = card->vcs[i];

		if (!vc)
@@ -1035,7 +1035,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) 
	skb = sb_pool_skb(card, le32_to_cpu(rsqe->word_2));

	if (skb == NULL) {

		printk("%s: NULL skb in %s, rsqe: %08x %08x %08x %08x\n",

		       card->name, __FUNCTION__,

		       card->name, __func__,

		       le32_to_cpu(rsqe->word_1), le32_to_cpu(rsqe->word_2),

		       le32_to_cpu(rsqe->word_3), le32_to_cpu(rsqe->word_4));

		return;
@@ -1873,7 +1873,7 @@ add_rx_skb(struct idt77252_dev *card, int queue, 
			return;



		if (sb_pool_add(card, skb, queue)) {

			printk("%s: SB POOL full\n", __FUNCTION__);

			printk("%s: SB POOL full\n", __func__);

			goto outfree;

		}
@@ -1883,7 +1883,7 @@ add_rx_skb(struct idt77252_dev *card, int queue, 
		IDT77252_PRV_PADDR(skb) = paddr;



		if (push_rx_skb(card, skb, queue)) {

			printk("%s: FB QUEUE full\n", __FUNCTION__);

			printk("%s: FB QUEUE full\n", __func__);

			goto outunmap;

		}

	}
@@ -3821,12 +3821,12 @@ static int __init idt77252_init(void) 
{

	struct sk_buff *skb;



	printk("%s: at %p\n", __FUNCTION__, idt77252_init);

	printk("%s: at %p\n", __func__, idt77252_init);



	if (sizeof(skb->cb) < sizeof(struct atm_skb_data) +

			      sizeof(struct idt77252_skb_prv)) {

		printk(KERN_ERR "%s: skb->cb is too small (%lu < %lu)\n",

		       __FUNCTION__, (unsigned long) sizeof(skb->cb),

		       __func__, (unsigned long) sizeof(skb->cb),

		       (unsigned long) sizeof(struct atm_skb_data) +

				       sizeof(struct idt77252_skb_prv));

		return -EIO;

drivers/bluetooth/hci_usb.c

+3 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ static struct usb_device_id blacklist_ids[] = { 
	{ USB_DEVICE(0x0400, 0x0807), .driver_info = HCI_BROKEN_ISOC },

	{ USB_DEVICE(0x0400, 0x080a), .driver_info = HCI_BROKEN_ISOC },



	/* CONWISE Technology based adapters with buggy SCO support */

	{ USB_DEVICE(0x0e5e, 0x6622), .driver_info = HCI_BROKEN_ISOC },



	/* Belkin F8T012 and F8T013 devices */

	{ USB_DEVICE(0x050d, 0x0012), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x050d, 0x0013), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },

CRA Git | Maintained and supported by SUSTech CRA and CCSE