Commit 3d412f60 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: (21 commits)
  [PKT_SCHED]: vlan tag match
  [NET]: Add if_addrlabel.h to sanitized headers.
  [NET] rtnetlink.c: remove no longer used functions
  [ICMP]: Restore pskb_pull calls in receive function
  [INET]: Fix accidentally broken inet(6)_hash_connect's port offset calculations.
  [NET]: Remove further references to net-modules.txt
  bluetooth rfcomm tty: destroy before tty_close()
  bluetooth: blacklist another Broadcom BCM2035 device
  drivers/bluetooth/btsdio.c: fix double-free
  drivers/bluetooth/bpa10x.c: fix memleak
  bluetooth: uninlining
  bluetooth: hidp_process_hid_control remove unnecessary parameter dealing
  tun: impossible to deassert IFF_ONE_QUEUE or IFF_NO_PI
  hamradio: fix dmascc section mismatch
  [SCTP]: Fix kernel panic while received AUTH chunk with BAD shared key identifier
  [SCTP]: Fix kernel panic while received AUTH chunk while enabled auth
  [IPV4]: Formatting fix for /proc/net/fib_trie.
  [IPV6]: Fix sysctl compilation error.
  [NET_SCHED]: Add #ifdef CONFIG_NET_EMATCH in net/sched/cls_flow.c (latest git broken build)
  [IPV4]: Fix compile error building without CONFIG_FS_PROC
  ...
parents 3098a180 3113e88c

drivers/bluetooth/bpa10x.c

+1 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ static int bpa10x_send_frame(struct sk_buff *skb) 
		break;



	default:

		usb_free_urb(urb);

		return -EILSEQ;

	}

drivers/bluetooth/btsdio.c

+1 −3
Original line number Diff line number Diff line
@@ -162,10 +162,8 @@ static int btsdio_rx_packet(struct btsdio_data *data) 
	bt_cb(skb)->pkt_type = hdr[3];



	err = hci_recv_frame(skb);

	if (err < 0) {

		kfree(skb);

	if (err < 0)

		return err;

	}



	sdio_writeb(data->func, 0x00, REG_PC_RRT, NULL);

drivers/bluetooth/hci_usb.c

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ static struct usb_device_id blacklist_ids[] = { 
	{ USB_DEVICE(0x0a5c, 0x2033), .driver_info = HCI_IGNORE },



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x2009), .driver_info = HCI_BCM92035 },

drivers/net/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -920,8 +920,7 @@ config ENC28J60 
	---help---

	  Support for the Microchip EN28J60 ethernet chip.



	  To compile this driver as a module, choose M here and read

	  <file:Documentation/networking/net-modules.txt>.  The module will be

	  To compile this driver as a module, choose M here. The module will be

	  called enc28j60.



config ENC28J60_WRITEVERIFY
@@ -2041,8 +2040,7 @@ config IGB 
         More specific information on configuring the driver is in

         <file:Documentation/networking/e1000.txt>.



         To compile this driver as a module, choose M here and read

         <file:Documentation/networking/net-modules.txt>.  The module

         To compile this driver as a module, choose M here. The module

         will be called igb.



source "drivers/net/ixp2000/Kconfig"

drivers/net/hamradio/dmascc.c

+2 −2
Original line number Diff line number Diff line
@@ -262,8 +262,8 @@ static void tm_isr(struct scc_priv *priv); 


static int io[MAX_NUM_DEVS] __initdata = { 0, };



/* Beware! hw[] is also used in cleanup_module(). */

static struct scc_hardware hw[NUM_TYPES] __initdata_or_module = HARDWARE;

/* Beware! hw[] is also used in dmascc_exit(). */

static struct scc_hardware hw[NUM_TYPES] = HARDWARE;





/* Global variables */

CRA Git | Maintained and supported by SUSTech CRA and CCSE