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

Commit 06dbbfef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPV4]: Explicitly call fib_get_table() in fib_frontend.c
  [NET]: Use BUILD_BUG_ON in net/core/flowi.c
  [NET]: Remove in-code externs for some functions from net/core/dev.c
  [NET]: Don't declare extern variables in net/core/sysctl_net_core.c
  [TCP]: Remove unneeded implicit type cast when calling tcp_minshall_update()
  [NET]: Treat the sign of the result of skb_headroom() consistently
  [9P]: Fix missing unlock before return in p9_mux_poll_start
  [PKT_SCHED]: Fix sch_prio.c build with CONFIG_NETDEVICES_MULTIQUEUE
  [IPV4] ip_gre: sendto/recvfrom NBMA address
  [SCTP]: Consolidate sctp_ulpq_renege_xxx functions
  [NETLINK]: Fix ACK processing after netlink_dump_start
  [VLAN]: MAINTAINERS update
  [DCCP]: Implement SIOCINQ/FIONREAD
  [NET]: Validate device addr prior to interface-up
parents 22fa8d59 03cf786c

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -4148,6 +4148,12 @@ W: http://linuxtv.org 
T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

S:	Maintained



VLAN (802.1Q)

P:	Patrick McHardy

M:	kaber@trash.net

L:	netdev@vger.kernel.org

S:	Maintained



VT1211 HARDWARE MONITOR DRIVER

P:	Juerg Haefliger

M:	juergh@gmail.com

drivers/net/rrunner.c

+3 −5
Original line number Diff line number Diff line
@@ -79,12 +79,10 @@ static char version[] __devinitdata = "rrunner.c: v0.50 11/11/2002 Jes Sorensen 
 */



/*

 * These are checked at init time to see if they are at least 256KB

 * and increased to 256KB if they are not. This is done to avoid ending

 * up with socket buffers smaller than the MTU size,

 * sysctl_[wr]mem_max are checked at init time to see if they are at

 * least 256KB and increased to 256KB if they are not. This is done to

 * avoid ending up with socket buffers smaller than the MTU size,

 */

extern __u32 sysctl_wmem_max;

extern __u32 sysctl_rmem_max;



static int __devinit rr_init_one(struct pci_dev *pdev,

	const struct pci_device_id *ent)

include/linux/netdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ struct net_device 
#define HAVE_SET_MAC_ADDR  		 

	int			(*set_mac_address)(struct net_device *dev,

						   void *addr);

#define HAVE_VALIDATE_ADDR

	int			(*validate_addr)(struct net_device *dev);

#define HAVE_PRIVATE_IOCTL

	int			(*do_ioctl)(struct net_device *dev,

					    struct ifreq *ifr, int cmd);

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ static inline int pskb_may_pull(struct sk_buff *skb, unsigned int len) 
 *

 *	Return the number of bytes of free space at the head of an &sk_buff.

 */

static inline int skb_headroom(const struct sk_buff *skb)

static inline unsigned int skb_headroom(const struct sk_buff *skb)

{

	return skb->data - skb->head;

}
@@ -1347,7 +1347,7 @@ static inline struct sk_buff *netdev_alloc_skb(struct net_device *dev, 
 *	Returns true if modifying the header part of the cloned buffer

 *	does not requires the data to be copied.

 */

static inline int skb_clone_writable(struct sk_buff *skb, int len)

static inline int skb_clone_writable(struct sk_buff *skb, unsigned int len)

{

	return !skb_header_cloned(skb) &&

	       skb_headroom(skb) + len <= skb->hdr_len;

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static inline int tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight) 
		return left <= tcp_max_burst(tp);

}



static inline void tcp_minshall_update(struct tcp_sock *tp, int mss,

static inline void tcp_minshall_update(struct tcp_sock *tp, unsigned int mss,

				       const struct sk_buff *skb)

{

	if (skb->len < mss)