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

Commit d8d8f6a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 57d1c91f a2167dc6

include/linux/filter.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static inline unsigned int sk_filter_len(struct sk_filter *fp) 
struct sk_buff;

struct sock;



extern int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen);

extern unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen);

extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);

extern int sk_chk_filter(struct sock_filter *filter, int flen);

#endif /* __KERNEL__ */

include/linux/inet.h

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,6 @@ 
#ifdef __KERNEL__

#include <linux/types.h>



extern __u32 in_aton(const char *str);

extern __be32 in_aton(const char *str);

#endif

#endif	/* _LINUX_INET_H */

include/linux/ip.h

+5 −5
Original line number Diff line number Diff line
@@ -90,14 +90,14 @@ struct iphdr { 
#error	"Please fix <asm/byteorder.h>"

#endif

	__u8	tos;

	__u16	tot_len;

	__u16	id;

	__u16	frag_off;

	__be16	tot_len;

	__be16	id;

	__be16	frag_off;

	__u8	ttl;

	__u8	protocol;

	__u16	check;

	__u32	saddr;

	__u32	daddr;

	__be32	saddr;

	__be32	daddr;

	/*The options start here. */

};

include/net/sock.h

+2 −2
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb, int needlock) 
		

		filter = sk->sk_filter;

		if (filter) {

			int pkt_len = sk_run_filter(skb, filter->insns,

			unsigned int pkt_len = sk_run_filter(skb, filter->insns,

							     filter->len);

			if (!pkt_len)

				err = -EPERM;

net/atm/br2684.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev) 
	unsigned char *rawp;

	eth = eth_hdr(skb);



	if (*eth->h_dest & 1) {

	if (is_multicast_ether_addr(eth->h_dest)) {

		if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)

			skb->pkt_type = PACKET_BROADCAST;

		else