Commit bfea13d4 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:
  [IPV4]: Remove IPVS icmp hack from route.c for now.
  [IPV4]: Correct rp_filter help text.
  [TCP]: TCP_CONG_YEAH requires TCP_CONG_VEGAS
  [TCP] slow start: Make comments and code logic clearer.
  [BLUETOOTH]: Fix locking in hci_sock_dev_event().
  [NET]: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h
  [NET]: lockdep classes in register_netdevice
parents 32f9306b f6c5d736

include/linux/mii.h

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ 
#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */

#define BMSR_RESV               0x00c0  /* Unused...                   */

#define BMSR_ESTATEN		0x0100	/* Extended Status in R15 */

#define BMSR_100FULL2		0x0200	/* Can do 100BASE-T2 HDX */

#define BMSR_100HALF2		0x0400	/* Can do 100BASE-T2 FDX */

#define BMSR_100HALF2           0x0200  /* Can do 100BASE-T2 HDX */

#define BMSR_100FULL2           0x0400  /* Can do 100BASE-T2 FDX */

#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */

#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */

#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */

net/bluetooth/hci_sock.c

+4 −2
Original line number Diff line number Diff line
@@ -665,7 +665,8 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event, 
		/* Detach sockets from device */

		read_lock(&hci_sk_list.lock);

		sk_for_each(sk, node, &hci_sk_list.head) {

			lock_sock(sk);

			local_bh_disable();

			bh_lock_sock_nested(sk);

			if (hci_pi(sk)->hdev == hdev) {

				hci_pi(sk)->hdev = NULL;

				sk->sk_err = EPIPE;
@@ -674,7 +675,8 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event, 


				hci_dev_put(hdev);

			}

			release_sock(sk);

			bh_unlock_sock(sk);

			local_bh_enable();

		}

		read_unlock(&hci_sk_list.lock);

	}

net/core/dev.c

+69 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 
#include <linux/dmaengine.h>

#include <linux/err.h>

#include <linux/ctype.h>

#include <linux/if_arp.h>



/*

 *	The list of packet types we will receive (as opposed to discard)
@@ -217,6 +218,73 @@ extern void netdev_unregister_sysfs(struct net_device *); 
#define	netdev_unregister_sysfs(dev)	do { } while(0)

#endif



#ifdef CONFIG_DEBUG_LOCK_ALLOC

/*

 * register_netdevice() inits dev->_xmit_lock and sets lockdep class

 * according to dev->type

 */

static const unsigned short netdev_lock_type[] =

	{ARPHRD_NETROM, ARPHRD_ETHER, ARPHRD_EETHER, ARPHRD_AX25,

	 ARPHRD_PRONET, ARPHRD_CHAOS, ARPHRD_IEEE802, ARPHRD_ARCNET,

	 ARPHRD_APPLETLK, ARPHRD_DLCI, ARPHRD_ATM, ARPHRD_METRICOM,

	 ARPHRD_IEEE1394, ARPHRD_EUI64, ARPHRD_INFINIBAND, ARPHRD_SLIP,

	 ARPHRD_CSLIP, ARPHRD_SLIP6, ARPHRD_CSLIP6, ARPHRD_RSRVD,

	 ARPHRD_ADAPT, ARPHRD_ROSE, ARPHRD_X25, ARPHRD_HWX25,

	 ARPHRD_PPP, ARPHRD_CISCO, ARPHRD_LAPB, ARPHRD_DDCMP,

	 ARPHRD_RAWHDLC, ARPHRD_TUNNEL, ARPHRD_TUNNEL6, ARPHRD_FRAD,

	 ARPHRD_SKIP, ARPHRD_LOOPBACK, ARPHRD_LOCALTLK, ARPHRD_FDDI,

	 ARPHRD_BIF, ARPHRD_SIT, ARPHRD_IPDDP, ARPHRD_IPGRE,

	 ARPHRD_PIMREG, ARPHRD_HIPPI, ARPHRD_ASH, ARPHRD_ECONET,

	 ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL,

	 ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211,

	 ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_VOID,

	 ARPHRD_NONE};



static const char *netdev_lock_name[] =

	{"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25",

	 "_xmit_PRONET", "_xmit_CHAOS", "_xmit_IEEE802", "_xmit_ARCNET",

	 "_xmit_APPLETLK", "_xmit_DLCI", "_xmit_ATM", "_xmit_METRICOM",

	 "_xmit_IEEE1394", "_xmit_EUI64", "_xmit_INFINIBAND", "_xmit_SLIP",

	 "_xmit_CSLIP", "_xmit_SLIP6", "_xmit_CSLIP6", "_xmit_RSRVD",

	 "_xmit_ADAPT", "_xmit_ROSE", "_xmit_X25", "_xmit_HWX25",

	 "_xmit_PPP", "_xmit_CISCO", "_xmit_LAPB", "_xmit_DDCMP",

	 "_xmit_RAWHDLC", "_xmit_TUNNEL", "_xmit_TUNNEL6", "_xmit_FRAD",

	 "_xmit_SKIP", "_xmit_LOOPBACK", "_xmit_LOCALTLK", "_xmit_FDDI",

	 "_xmit_BIF", "_xmit_SIT", "_xmit_IPDDP", "_xmit_IPGRE",

	 "_xmit_PIMREG", "_xmit_HIPPI", "_xmit_ASH", "_xmit_ECONET",

	 "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL",

	 "_xmit_FCFABRIC", "_xmit_IEEE802_TR", "_xmit_IEEE80211",

	 "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_VOID",

	 "_xmit_NONE"};



static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)];



static inline unsigned short netdev_lock_pos(unsigned short dev_type)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(netdev_lock_type); i++)

		if (netdev_lock_type[i] == dev_type)

			return i;

	/* the last key is used by default */

	return ARRAY_SIZE(netdev_lock_type) - 1;

}



static inline void netdev_set_lockdep_class(spinlock_t *lock,

					    unsigned short dev_type)

{

	int i;



	i = netdev_lock_pos(dev_type);

	lockdep_set_class_and_name(lock, &netdev_xmit_lock_key[i],

				   netdev_lock_name[i]);

}

#else

static inline void netdev_set_lockdep_class(spinlock_t *lock,

					    unsigned short dev_type)

{

}

#endif



/*******************************************************************************
@@ -3001,6 +3069,7 @@ int register_netdevice(struct net_device *dev) 


	spin_lock_init(&dev->queue_lock);

	spin_lock_init(&dev->_xmit_lock);

	netdev_set_lockdep_class(&dev->_xmit_lock, dev->type);

	dev->xmit_lock_owner = -1;

	spin_lock_init(&dev->ingress_lock);

net/ipv4/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ config IP_ADVANCED_ROUTER 
	  asymmetric routing (packets from you to a host take a different path

	  than packets from that host to you) or if you operate a non-routing

	  host which has several IP addresses on different interfaces. To turn

	  rp_filter off use:

	  rp_filter on use:



	  echo 0 > /proc/sys/net/ipv4/conf/<device>/rp_filter

	  echo 1 > /proc/sys/net/ipv4/conf/<device>/rp_filter

	  or

	  echo 0 > /proc/sys/net/ipv4/conf/all/rp_filter

	  echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter



	  If unsure, say N here.
@@ -577,6 +577,7 @@ config TCP_CONG_VENO 
config TCP_CONG_YEAH

	tristate "YeAH TCP"

	depends on EXPERIMENTAL

	select TCP_CONG_VEGAS

	default n

	---help---

	YeAH-TCP is a sender-side high-speed enabled TCP congestion control

net/ipv4/route.c

+2 −2
Original line number Diff line number Diff line
@@ -2396,7 +2396,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp) 


		/* It is equivalent to inet_addr_type(saddr) == RTN_LOCAL */

		dev_out = ip_dev_find(oldflp->fl4_src);

		if ((dev_out == NULL) && !(sysctl_ip_nonlocal_bind))

		if (dev_out == NULL)

			goto out;



		/* I removed check for oif == dev_out->oif here.
@@ -2407,7 +2407,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp) 
		      of another iface. --ANK

		 */



		if (dev_out && oldflp->oif == 0

		if (oldflp->oif == 0

		    && (MULTICAST(oldflp->fl4_dst) || oldflp->fl4_dst == htonl(0xFFFFFFFF))) {

			/* Special hack: user can direct multicasts

			   and limited broadcast via necessary interface

CRA Git | Maintained and supported by SUSTech CRA and CCSE