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

Commit 80d74d51 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:
  [BRIDGE]: Unaligned access when comparing ethernet addresses
  [SCTP]: Unmap v4mapped addresses during SCTP_BINDX_REM_ADDR operation.
  [SCTP]: Fix assertion (!atomic_read(&sk->sk_rmem_alloc)) failed message
  [NET]: Set a separate lockdep class for neighbour table's proxy_queue
  [NET]: Fix UDP checksum issue in net poll mode.
  [KEY]: Fix conversion between IPSEC_MODE_xxx and XFRM_MODE_xxx.
  [NET]: Get rid of alloc_skb_from_cache
parents 245d95a4 19bb3506

arch/x86_64/kernel/functionlist

+0 −1
Original line number Diff line number Diff line
@@ -514,7 +514,6 @@ 
*(.text.dentry_open)

*(.text.dentry_iput)

*(.text.bio_alloc)

*(.text.alloc_skb_from_cache)

*(.text.wait_on_page_bit)

*(.text.vfs_readdir)

*(.text.vfs_lstat)

include/linux/skbuff.h

+7 −3
Original line number Diff line number Diff line
@@ -346,9 +346,6 @@ static inline struct sk_buff *alloc_skb_fclone(unsigned int size, 
	return __alloc_skb(size, priority, 1, -1);

}



extern struct sk_buff *alloc_skb_from_cache(struct kmem_cache *cp,

					    unsigned int size,

					    gfp_t priority);

extern void	       kfree_skbmem(struct sk_buff *skb);

extern struct sk_buff *skb_clone(struct sk_buff *skb,

				 gfp_t priority);
@@ -622,6 +619,13 @@ static inline void skb_queue_head_init(struct sk_buff_head *list) 
	list->qlen = 0;

}



static inline void skb_queue_head_init_class(struct sk_buff_head *list,

		struct lock_class_key *class)

{

	skb_queue_head_init(list);

	lockdep_set_class(&list->lock, class);

}



/*

 *	Insert an sk_buff at the start of a list.

 *

net/bridge/br_stp_if.c

+7 −2
Original line number Diff line number Diff line
@@ -126,7 +126,9 @@ void br_stp_disable_port(struct net_bridge_port *p) 
/* called under bridge lock */

void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *addr)

{

	unsigned char oldaddr[6];

	/* should be aligned on 2 bytes for compare_ether_addr() */

	unsigned short oldaddr_aligned[ETH_ALEN >> 1];

	unsigned char *oldaddr = (unsigned char *)oldaddr_aligned;

	struct net_bridge_port *p;

	int wasroot;
@@ -151,11 +153,14 @@ void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *addr) 
		br_become_root_bridge(br);

}



static const unsigned char br_mac_zero[6];

/* should be aligned on 2 bytes for compare_ether_addr() */

static const unsigned short br_mac_zero_aligned[ETH_ALEN >> 1];



/* called under bridge lock */

void br_stp_recalculate_bridge_id(struct net_bridge *br)

{

	const unsigned char *br_mac_zero =

			(const unsigned char *)br_mac_zero_aligned;

	const unsigned char *addr = br_mac_zero;

	struct net_bridge_port *p;

net/core/neighbour.c

+4 −1
Original line number Diff line number Diff line
@@ -1331,6 +1331,8 @@ void neigh_parms_destroy(struct neigh_parms *parms) 
	kfree(parms);

}



static struct lock_class_key neigh_table_proxy_queue_class;



void neigh_table_init_no_netlink(struct neigh_table *tbl)

{

	unsigned long now = jiffies;
@@ -1379,7 +1381,8 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl) 
	init_timer(&tbl->proxy_timer);

	tbl->proxy_timer.data	  = (unsigned long)tbl;

	tbl->proxy_timer.function = neigh_proxy_process;

	skb_queue_head_init(&tbl->proxy_queue);

	skb_queue_head_init_class(&tbl->proxy_queue,

			&neigh_table_proxy_queue_class);



	tbl->last_flush = now;

	tbl->last_rand	= now + tbl->parms.reachable_time * 20;

net/core/netpoll.c

+7 −0
Original line number Diff line number Diff line
@@ -471,6 +471,13 @@ int __netpoll_rx(struct sk_buff *skb) 
	if (skb->len < len || len < iph->ihl*4)

		goto out;



	/*

	 * Our transport medium may have padded the buffer out.

	 * Now We trim to the true length of the frame.

	 */

	if (pskb_trim_rcsum(skb, len))

		goto out;



	if (iph->protocol != IPPROTO_UDP)

		goto out;