Commit f6866fec 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: (82 commits)
  [NET]: Make sure sockets implement splice_read
  netconsole: avoid null pointer dereference at show_local_mac()
  [IPV6]: Fix reversed local_df test in ip6_fragment
  [XFRM]: Avoid bogus BUG() when throwing new policy away.
  [AF_KEY]: Fix bug in spdadd
  [NETFILTER] nf_conntrack_proto_tcp.c: Mistyped state corrected.
  net: xfrm statistics depend on INET
  [NETFILTER]: make secmark_tg_destroy() static
  [INET]: Unexport inet_listen_wlock
  [INET]: Unexport __inet_hash_connect
  [NET]: Improve cache line coherency of ingress qdisc
  [NET]: Fix race in dev_close(). (Bug 9750)
  [IPSEC]: Fix bogus usage of u64 on input sequence number
  [RTNETLINK]: Send a single notification on device state changes.
  [NETLABLE]: Hide netlbl_unlabel_audit_addr6 under ifdef CONFIG_IPV6.
  [NETLABEL]: Don't produce unused variables when IPv6 is off.
  [NETLABEL]: Compilation for CONFIG_AUDIT=n case.
  [GENETLINK]: Relax dances with genl_lock.
  [NETLABEL]: Fix lookup logic of netlbl_domhsh_search_def.
  [IPV6]: remove unused method declaration (net/ndisc.h).
  ...
parents 4ee29f6a 997b37da

drivers/bluetooth/hci_ldisc.c

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ static int hci_uart_close(struct hci_dev *hdev) 
		return 0;



	hci_uart_flush(hdev);

	hdev->flush = NULL;

	return 0;

}

drivers/net/8139too.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int debug = -1; 
 * Warning: 64K ring has hardware issues and may lock up.

 */

#if defined(CONFIG_SH_DREAMCAST)

#define RX_BUF_IDX	1	/* 16K ring */

#define RX_BUF_IDX 0	/* 8K ring */

#else

#define RX_BUF_IDX	2	/* 32K ring */

#endif

drivers/net/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -931,6 +931,14 @@ config ENC28J60_WRITEVERIFY 
	  Enable the verify after the buffer write useful for debugging purpose.

	  If unsure, say N.



config DM9000_DEBUGLEVEL

	int "DM9000 maximum debug level"

	depends on DM9000

	default 4

	help

	  The maximum level of debugging code compiled into the DM9000

	  driver.



config SMC911X

	tristate "SMSC LAN911[5678] support"

	select CRC32
@@ -2352,6 +2360,16 @@ config GELIC_NET 
	  To compile this driver as a module, choose M here: the

	  module will be called ps3_gelic.



config GELIC_WIRELESS

       bool "PS3 Wireless support"

       depends on GELIC_NET

       help

        This option adds the support for the wireless feature of PS3.

        If you have the wireless-less model of PS3 or have no plan to

        use wireless feature, disabling this option saves memory.  As

        the driver automatically distinguishes the models, you can

        safely enable this option even if you have a wireless-less model.



config GIANFAR

	tristate "Gianfar Ethernet"

	depends on FSL_SOC

drivers/net/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ obj-$(CONFIG_BNX2X) += bnx2x.o 
spidernet-y += spider_net.o spider_net_ethtool.o

obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o

obj-$(CONFIG_GELIC_NET) += ps3_gelic.o

ps3_gelic-objs += ps3_gelic_net.o

gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o

ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)

obj-$(CONFIG_TC35815) += tc35815.o

obj-$(CONFIG_SKGE) += skge.o

obj-$(CONFIG_SKY2) += sky2.o

drivers/net/cxgb3/l2t.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ found: 
			if (neigh->nud_state & NUD_FAILED) {

				arpq = e->arpq_head;

				e->arpq_head = e->arpq_tail = NULL;

			} else if (neigh_is_connected(neigh))

			} else if (neigh->nud_state & (NUD_CONNECTED|NUD_STALE))

				setup_l2e_send_pending(dev, NULL, e);

		} else {

			e->state = neigh_is_connected(neigh) ?

CRA Git | Maintained and supported by SUSTech CRA and CCSE