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

Commit 7e20ef03 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: (49 commits)
  [SCTP]: Set assoc_id correctly during INIT collision.
  [SCTP]: Re-order SCTP initializations to avoid race with sctp_rcv()
  [SCTP]: Fix the SO_REUSEADDR handling to be similar to TCP.
  [SCTP]: Verify all destination ports in sctp_connectx.
  [XFRM] SPD info TLV aggregation
  [XFRM] SAD info TLV aggregationx
  [AF_RXRPC]: Sort out MTU handling.
  [AF_IUCV/IUCV] : Add missing section annotations
  [AF_IUCV]: Implementation of a skb backlog queue
  [NETLINK]: Remove bogus BUG_ON
  [IPV6]: Some cleanups in include/net/ipv6.h
  [TCP]: zero out rx_opt in tcp_disconnect()
  [BNX2]: Fix TSO problem with small MSS.
  [NET]: Rework dev_base via list_head (v3)
  [TCP] Highspeed: Limited slow-start is nowadays in tcp_slow_start
  [BNX2]: Update version and reldate.
  [BNX2]: Print bus information for PCIE devices.
  [BNX2]: Add 1-shot MSI handler for 5709.
  [BNX2]: Restructure PHY event handling.
  [BNX2]: Add indirect spinlock.
  ...
parents a3d52136 07d93967

arch/s390/appldata/appldata_net_sum.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static void appldata_get_net_sum_data(void *data) 
	tx_dropped = 0;

	collisions = 0;

	read_lock(&dev_base_lock);

	for (dev = dev_base; dev != NULL; dev = dev->next) {

	for_each_netdev(dev) {

		stats = dev->get_stats(dev);

		rx_packets += stats->rx_packets;

		tx_packets += stats->tx_packets;

arch/sparc64/solaris/ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -686,7 +686,8 @@ static inline int solaris_i(unsigned int fd, unsigned int cmd, u32 arg) 
			int i = 0;

			

			read_lock_bh(&dev_base_lock);

			for (d = dev_base; d; d = d->next) i++;

			for_each_netdev(d)

				i++;

			read_unlock_bh(&dev_base_lock);



			if (put_user (i, (int __user *)A(arg)))

drivers/block/aoe/aoecmd.c

+5 −3
Original line number Diff line number Diff line
@@ -194,15 +194,15 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail) 
	sl = sl_tail = NULL;



	read_lock(&dev_base_lock);

	for (ifp = dev_base; ifp; dev_put(ifp), ifp = ifp->next) {

	for_each_netdev(ifp) {

		dev_hold(ifp);

		if (!is_aoe_netif(ifp))

			continue;

			goto cont;



		skb = new_skb(sizeof *h + sizeof *ch);

		if (skb == NULL) {

			printk(KERN_INFO "aoe: skb alloc failure\n");

			continue;

			goto cont;

		}

		skb_put(skb, sizeof *h + sizeof *ch);

		skb->dev = ifp;
@@ -221,6 +221,8 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail) 


		skb->next = sl;

		sl = skb;

cont:

		dev_put(ifp);

	}

	read_unlock(&dev_base_lock);