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

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

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

parents 91b90475 246955fe

include/linux/atalk.h

+13 −13
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#define SIOCATALKDIFADDR       (SIOCPROTOPRIVATE + 0)



struct atalk_addr {

	__u16	s_net;

	__be16	s_net;

	__u8	s_node;

};
@@ -33,8 +33,8 @@ struct sockaddr_at { 


struct atalk_netrange {

	__u8	nr_phase;

	__u16	nr_firstnet;

	__u16	nr_lastnet;

	__be16	nr_firstnet;

	__be16	nr_lastnet;

};



#ifdef __KERNEL__
@@ -70,8 +70,8 @@ struct atalk_iface { 
struct atalk_sock {

	/* struct sock has to be the first member of atalk_sock */

	struct sock	sk;

	unsigned short	dest_net;

	unsigned short	src_net;

	__be16		dest_net;

	__be16		src_net;

	unsigned char	dest_node;

	unsigned char	src_node;

	unsigned char	dest_port;
@@ -95,9 +95,9 @@ struct ddpehdr { 
		deh_hops:4,

		deh_len:10;

#endif

	__u16	deh_sum;

	__u16	deh_dnet;

	__u16	deh_snet;

	__be16	deh_sum;

	__be16	deh_dnet;

	__be16	deh_snet;

	__u8	deh_dnode;

	__u8	deh_snode;

	__u8	deh_dport;
@@ -142,24 +142,24 @@ struct ddpshdr { 


/* AppleTalk AARP headers */

struct elapaarp {

	__u16	hw_type;

	__be16	hw_type;

#define AARP_HW_TYPE_ETHERNET		1

#define AARP_HW_TYPE_TOKENRING		2

	__u16	pa_type;

	__be16	pa_type;

	__u8	hw_len;

	__u8	pa_len;

#define AARP_PA_ALEN			4

	__u16	function;

	__be16	function;

#define AARP_REQUEST			1

#define AARP_REPLY			2

#define AARP_PROBE			3

	__u8	hw_src[ETH_ALEN]	__attribute__ ((packed));

	__u8	pa_src_zero		__attribute__ ((packed));

	__u16	pa_src_net		__attribute__ ((packed));

	__be16	pa_src_net		__attribute__ ((packed));

	__u8	pa_src_node		__attribute__ ((packed));

	__u8	hw_dst[ETH_ALEN]	__attribute__ ((packed));

	__u8	pa_dst_zero		__attribute__ ((packed));

	__u16	pa_dst_net		__attribute__ ((packed));

	__be16	pa_dst_net		__attribute__ ((packed));

	__u8	pa_dst_node		__attribute__ ((packed));	

};

include/linux/netlink.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#define NETLINK_SELINUX		7	/* SELinux event notifications */

#define NETLINK_ARPD		8

#define NETLINK_AUDIT		9	/* auditing */

#define NETLINK_FIB_LOOKUP	10	

#define NETLINK_ROUTE6		11	/* af_inet6 route comm channel */

#define NETLINK_IP6_FW		13

#define NETLINK_DNRTMSG		14	/* DECnet routing messages */

include/linux/pfkeyv2.h

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ struct sadb_x_nat_t_port { 


/* Security Association flags */

#define SADB_SAFLAGS_PFS	1

#define SADB_SAFLAGS_NOPMTUDISC	0x20000000

#define SADB_SAFLAGS_DECAP_DSCP	0x40000000

#define SADB_SAFLAGS_NOECN	0x80000000

include/linux/xfrm.h

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ struct xfrm_usersa_info { 
	__u8				flags;

#define XFRM_STATE_NOECN	1

#define XFRM_STATE_DECAP_DSCP	2

#define XFRM_STATE_NOPMTUDISC	4

};



struct xfrm_usersa_id {

include/net/ax25.h

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static __inline__ void ax25_cb_put(ax25_cb *ax25) 
	}

}



static inline unsigned short ax25_type_trans(struct sk_buff *skb, struct net_device *dev)

static inline __be16 ax25_type_trans(struct sk_buff *skb, struct net_device *dev)

{

	skb->dev      = dev;

	skb->pkt_type = PACKET_HOST;