Commit b55813a2 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:
  [NETFILTER] x_table.c: sem2mutex
  [IPV4]: Aggregate route entries with different TOS values
  [TCP]: Mark tcp_*mem[] __read_mostly.
  [TCP]: Set default max buffers from memory pool size
  [SCTP]: Fix up sctp_rcv return value
  [NET]: Take RTNL when unregistering notifier
  [WIRELESS]: Fix config dependencies.
  [NET]: Fill in a 32-bit hole in struct sock on 64-bit platforms.
  [NET]: Ensure device name passed to SO_BINDTODEVICE is NULL terminated.
  [MODULES]: Don't allow statically declared exports
  [BRIDGE]: Unaligned accesses in the ethernet bridge
parents 368d17e0 9e19bb6d

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config NET_RADIO 


config NET_WIRELESS_RTNETLINK

	bool "Wireless Extension API over RtNetlink"

	depends on NET_RADIO

	---help---

	  Support the Wireless Extension API over the RtNetlink socket

	  in addition to the traditional ioctl interface (selected above).

include/linux/module.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ void *__symbol_get_gpl(const char *symbol); 


/* For every exported symbol, place a struct in the __ksymtab section */

#define __EXPORT_SYMBOL(sym, sec)				\

	extern typeof(sym) sym;					\

	__CRC_SYMBOL(sym, sec)					\

	static const char __kstrtab_##sym[]			\

	__attribute__((section("__ksymtab_strings")))		\

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ extern struct ip_rt_acct *ip_rt_acct; 
struct in_device;

extern int		ip_rt_init(void);

extern void		ip_rt_redirect(u32 old_gw, u32 dst, u32 new_gw,

				       u32 src, u8 tos, struct net_device *dev);

				       u32 src, struct net_device *dev);

extern void		ip_rt_advice(struct rtable **rp, int advice);

extern void		rt_cache_flush(int how);

extern int		__ip_route_output_key(struct rtable **, const struct flowi *flp);

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ struct sock { 
	gfp_t			sk_allocation;

	int			sk_sndbuf;

	int			sk_route_caps;

	int			sk_rcvlowat;

	unsigned long 		sk_flags;

	unsigned long	        sk_lingertime;

	/*
@@ -230,7 +231,6 @@ struct sock { 
	unsigned short		sk_max_ack_backlog;

	__u32			sk_priority;

	struct ucred		sk_peercred;

	int			sk_rcvlowat;

	long			sk_rcvtimeo;

	long			sk_sndtimeo;

	struct sk_filter      	*sk_filter;

net/bridge/br_stp_bpdu.c

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/llc.h>

#include <net/llc.h>

#include <net/llc_pdu.h>

#include <asm/unaligned.h>



#include "br_private.h"

#include "br_private_stp.h"
@@ -59,12 +60,12 @@ static inline void br_set_ticks(unsigned char *dest, int j) 
{

	unsigned long ticks = (STP_HZ * j)/ HZ;



	*((__be16 *) dest) = htons(ticks);

	put_unaligned(htons(ticks), (__be16 *)dest);

}



static inline int br_get_ticks(const unsigned char *src)

{

	unsigned long ticks = ntohs(*(__be16 *)src);

	unsigned long ticks = ntohs(get_unaligned((__be16 *)src));



	return (ticks * HZ + STP_HZ - 1) / STP_HZ;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE