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

Commit 1feb17e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETPOLL]: Fixups for 'fix soft lockup when removing module'
  [NET]: net/core/netevent.c should #include <net/netevent.h>
  [NETFILTER]: nf_conntrack_h323: add checking of out-of-range on choices' index values
  [NET] skbuff: remove export of static symbol
  SCTP: Add scope_id validation for link-local binds
  SCTP: Check to make sure file is valid before setting timeout
  SCTP: Fix thinko in sctp_copy_laddrs()
parents dadde13a 25442caf

net/core/netevent.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/rtnetlink.h>

#include <linux/notifier.h>

#include <net/netevent.h>



static ATOMIC_NOTIFIER_HEAD(netevent_notif_chain);

net/core/netpoll.c

+2 −4
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ static void queue_process(struct work_struct *work) 
			netif_tx_unlock(dev);

			local_irq_restore(flags);



			if (atomic_read(&npinfo->refcnt))

			schedule_delayed_work(&npinfo->tx_work, HZ/10);

			return;

		}
@@ -786,8 +785,7 @@ void netpoll_cleanup(struct netpoll *np) 
			if (atomic_dec_and_test(&npinfo->refcnt)) {

				skb_queue_purge(&npinfo->arp_tx);

				skb_queue_purge(&npinfo->txq);

				cancel_delayed_work(&npinfo->tx_work);

				flush_scheduled_work();

				cancel_rearming_delayed_work(&npinfo->tx_work);



				/* clean after last, unfinished work */

				if (!skb_queue_empty(&npinfo->txq)) {

net/core/skbuff.c

+0 −1
Original line number Diff line number Diff line
@@ -2211,7 +2211,6 @@ EXPORT_SYMBOL(pskb_copy); 
EXPORT_SYMBOL(pskb_expand_head);

EXPORT_SYMBOL(skb_checksum);

EXPORT_SYMBOL(skb_clone);

EXPORT_SYMBOL(skb_clone_fraglist);

EXPORT_SYMBOL(skb_copy);

EXPORT_SYMBOL(skb_copy_and_csum_bits);

EXPORT_SYMBOL(skb_copy_and_csum_dev);

net/netfilter/nf_conntrack_h323_asn1.c

+3 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) 
			CHECK_BOUND(bs, 2);

			len = get_len(bs);

			CHECK_BOUND(bs, len);

			if (!base) {

			if (!base || !(son->attr & DECODE)) {

				PRINT("%*.s%s\n", (level + 1) * TAB_SIZE,

				      " ", son->name);

				bs->cur += len;
@@ -704,6 +704,8 @@ int decode_choice(bitstr_t * bs, field_t * f, char *base, int level) 
	} else {

		ext = 0;

		type = get_bits(bs, f->sz);

		if (type >= f->lb)

			return H323_ERROR_RANGE;

	}



	/* Write Type */

net/sctp/ipv6.c

+4 −0
Original line number Diff line number Diff line
@@ -844,6 +844,10 @@ static int sctp_inet6_bind_verify(struct sctp_sock *opt, union sctp_addr *addr) 
			dev = dev_get_by_index(addr->v6.sin6_scope_id);

			if (!dev)

				return 0;

			if (!ipv6_chk_addr(&addr->v6.sin6_addr, dev, 0)) {

				dev_put(dev);

				return 0;

			}

			dev_put(dev);

		}

		af = opt->pf->af;