Commit 152a6a9d 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: (21 commits)
  [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts
  [IPV4] SNMP: Support InMcastPkts and InBcastPkts
  [IPV4] SNMP: Support InTruncatedPkts
  [IPV4] SNMP: Support InNoRoutes
  [SNMP]: Add definitions for {In,Out}BcastPkts
  [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent
  [TCP] FRTO: Delay skb available check until it's mandatory
  [XFRM]: Restrict upper layer information by bundle.
  [TCP]: Catch skb with S+L bugs earlier
  [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo
  [L2TP]: Add the ability to autoload a pppox protocol module.
  [SKB]: Introduce skb_queue_walk_safe()
  [AF_IUCV/IUCV]: smp_call_function deadlock
  [IPV6]: Fix slab corruption running ip6sic
  [TCP]: Update references in two old comments
  [XFRM]: Export SPD info
  [IPV6]: Track device renames in snmp6.
  [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.
  [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.
  [NETPOLL]: Remove CONFIG_NETPOLL_RX
  ...
parents cd9bb7e7 80787ebc

arch/s390/appldata/appldata_net_sum.c

+0 −3
Original line number Diff line number Diff line
@@ -109,9 +109,6 @@ static void appldata_get_net_sum_data(void *data) 
	read_lock(&dev_base_lock);

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

		stats = dev->get_stats(dev);

		if (stats == NULL) {

			continue;

		}

		rx_packets += stats->rx_packets;

		tx_packets += stats->tx_packets;

		rx_bytes   += stats->rx_bytes;

drivers/net/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -2927,11 +2927,6 @@ endif #NETDEVICES 
config NETPOLL

	def_bool NETCONSOLE



config NETPOLL_RX

	bool "Netpoll support for trapping incoming packets"

	default n

	depends on NETPOLL



config NETPOLL_TRAP

	bool "Netpoll traffic trapping"

	default n

drivers/net/bonding/bond_main.c

+25 −34
Original line number Diff line number Diff line
@@ -1360,13 +1360,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
		goto err_undo_flags;

	}



	if (slave_dev->get_stats == NULL) {

		printk(KERN_NOTICE DRV_NAME

			": %s: the driver for slave device %s does not provide "

			"get_stats function, network statistics will be "

			"inaccurate.\n", bond_dev->name, slave_dev->name);

	}



	new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);

	if (!new_slave) {

		res = -ENOMEM;
@@ -3641,7 +3634,6 @@ static struct net_device_stats *bond_get_stats(struct net_device *bond_dev) 


	bond_for_each_slave(bond, slave, i) {

		sstats = slave->dev->get_stats(slave->dev);

		if (sstats) {

		stats->rx_packets += sstats->rx_packets;

		stats->rx_bytes += sstats->rx_bytes;

		stats->rx_errors += sstats->rx_errors;
@@ -3668,7 +3660,6 @@ static struct net_device_stats *bond_get_stats(struct net_device *bond_dev) 
		stats->tx_heartbeat_errors += sstats->tx_heartbeat_errors;

		stats->tx_window_errors += sstats->tx_window_errors;

	}

	}



	read_unlock_bh(&bond->lock);

drivers/net/pppox.c

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/ppp_defs.h>

#include <linux/if_ppp.h>

#include <linux/ppp_channel.h>

#include <linux/kmod.h>



#include <net/sock.h>
@@ -114,6 +115,13 @@ static int pppox_create(struct socket *sock, int protocol) 
		goto out;



	rc = -EPROTONOSUPPORT;

#ifdef CONFIG_KMOD

	if (!pppox_protos[protocol]) {

		char buffer[32];

		sprintf(buffer, "pppox-proto-%d", protocol);

		request_module(buffer);

	}

#endif

	if (!pppox_protos[protocol] ||

	    !try_module_get(pppox_protos[protocol]->owner))

		goto out;

drivers/parisc/led.c

+0 −2
Original line number Diff line number Diff line
@@ -373,8 +373,6 @@ static __inline__ int led_get_net_activity(void) 
	    if (LOOPBACK(in_dev->ifa_list->ifa_local))

		continue;

	    stats = dev->get_stats(dev);

	    if (!stats)

		continue;

	    rx_total += stats->rx_packets;

	    tx_total += stats->tx_packets;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE