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

Commit 61a46dc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
  [IOAT]: Do not dereference THIS_MODULE directly to set unsafe.
  [NETROM]: Fix possible null pointer dereference.
  [NET] netpoll: break recursive loop in netpoll rx path
  [NET] netpoll: don't spin forever sending to stopped queues
  [IRDA]: add some IBM think pads
  [ATM]: atm/mpc.c warning fix
  [NET]: skb_find_text ignores to argument
  [NET]: make net/core/dev.c:netdev_nit static
  [NET]: Fix GSO problems in dev_hard_start_xmit()
  [NET]: Fix CHECKSUM_HW GSO problems.
  [TIPC]: Fix incorrect correction to discovery timer frequency computation.
  [TIPC]: Get rid of dynamically allocated arrays in broadcast code.
  [TIPC]: Fixed link switchover bugs
  [TIPC]: Enhanced & cleaned up system messages; fixed 2 obscure memory leaks.
  [TIPC]: First phase of assert() cleanup
  [TIPC]: Disallow config operations that aren't supported in certain modes.
  [TIPC]: Fixed memory leak in tipc_link_send() when destination is unreachable
  [TIPC]: Added missing warning for out-of-memory condition
  [TIPC]: Withdrawing all names from nameless port now returns success, not error
  [TIPC]: Optimized argument validation done by connect().
  ...
parents b78709cf 8070b2b1

drivers/dma/ioatdma.c

+2 −3
Original line number Diff line number Diff line
@@ -824,10 +824,9 @@ static int __init ioat_init_module(void) 
{

	/* it's currently unsafe to unload this module */

	/* if forced, worst case is that rmmod hangs */

	if (THIS_MODULE != NULL)

		THIS_MODULE->unsafe = 1;

	__unsafe(THIS_MODULE);



	return pci_module_init(&ioat_pci_drv);

	pci_module_init(&ioat_pci_drv);

}



module_init(ioat_init_module);

drivers/net/irda/nsc-ircc.c

+6 −2
Original line number Diff line number Diff line
@@ -115,7 +115,11 @@ static nsc_chip_t chips[] = { 
	/* Contributed by Jan Frey - IBM A30/A31 */

	{ "PC8739x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xea, 0xff, 

	  nsc_ircc_probe_39x, nsc_ircc_init_39x },

	{ "IBM", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,

	/* IBM ThinkPads using PC8738x (T60/X60/Z60) */

	{ "IBM-PC8738x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,

	  nsc_ircc_probe_39x, nsc_ircc_init_39x },

	/* IBM ThinkPads using PC8394T (T43/R52/?) */

	{ "IBM-PC8394T", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf9, 0xff,

	  nsc_ircc_probe_39x, nsc_ircc_init_39x },

	{ NULL }

};

include/linux/netdevice.h

+0 −1
Original line number Diff line number Diff line
@@ -699,7 +699,6 @@ extern int dev_hard_start_xmit(struct sk_buff *skb, 


extern void		dev_init(void);



extern int		netdev_nit;

extern int		netdev_budget;



/* Called by rtnetlink.c:rtnl_unlock() */

include/linux/netpoll.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ struct netpoll_info { 
	int rx_flags;

	spinlock_t rx_lock;

	struct netpoll *rx_np; /* netpoll that registered an rx_hook */

	struct sk_buff_head arp_tx; /* list of arp requests to reply to */

};



void netpoll_poll(struct netpoll *np);

include/net/tipc/tipc_bearer.h

+10 −2
Original line number Diff line number Diff line
@@ -49,10 +49,18 @@ 


#define TIPC_MEDIA_TYPE_ETH	1



/* 

 * Destination address structure used by TIPC bearers when sending messages

 * 

 * IMPORTANT: The fields of this structure MUST be stored using the specified

 * byte order indicated below, as the structure is exchanged between nodes

 * as part of a link setup process.

 */



struct tipc_media_addr {

	__u32  type;

	__u32  type;			/* bearer type (network byte order) */

	union {

		__u8   eth_addr[6];	/* Ethernet bearer */ 

		__u8   eth_addr[6];	/* 48 bit Ethernet addr (byte array) */ 

#if 0

		/* Prototypes for other possible bearer types */