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

Commit d1ed6a3e 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:
  [NETLABEL]: Fix build failure.
  [IPV6]: Give sit driver an appropriate module alias.
  [IPV6]: Add ndisc_netdev_notifier unregister.
  [NET]: __alloc_pages() failures reported due to fragmentation
  [PKTGEN]: TCI endianness fixes
  [TG3]: Fix 2nd ifup failure on 5752M.
  [NETFILTER] bug: skb->protocol is already net-endian
  [NETFILTER] bug: nfulnl_msg_config_mode ->copy_range is 32bit
  [NETFILTER] bug: NFULA_CFG_QTHRESH uses 32bit
  [IPV6]: Fix ECN bug on big-endian
  [IPX]: Annotate and fix IPX checksum
  [IPX]: Trivial parts of endianness annotations
parents 59359ff8 38c94377

drivers/net/tg3.c

+4 −4
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.67"

#define DRV_MODULE_RELDATE	"October 18, 2006"

#define DRV_MODULE_VERSION	"3.68"

#define DRV_MODULE_RELDATE	"November 02, 2006"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -6014,7 +6014,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
		tg3_abort_hw(tp, 1);

	}



	if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) && reset_phy)

	if (reset_phy)

		tg3_phy_reset(tp);



	err = tg3_chip_reset(tp);
@@ -6574,7 +6574,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
		tw32(GRC_LOCAL_CTRL, tp->grc_local_ctrl);

	}



	err = tg3_setup_phy(tp, reset_phy);

	err = tg3_setup_phy(tp, 0);

	if (err)

		return err;

include/linux/ipx.h

+7 −7
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 


struct sockaddr_ipx {

	sa_family_t	sipx_family;

	__u16		sipx_port;

	__u32		sipx_network;

	__be16		sipx_port;

	__be32		sipx_network;

	unsigned char 	sipx_node[IPX_NODE_LEN];

	__u8		sipx_type;

	unsigned char	sipx_zero;	/* 16 byte fill */
@@ -23,13 +23,13 @@ struct sockaddr_ipx { 
#define IPX_CRTITF	1



struct ipx_route_definition {

	__u32         ipx_network;

	__u32         ipx_router_network;

	__be32        ipx_network;

	__be32        ipx_router_network;

	unsigned char ipx_router_node[IPX_NODE_LEN];

};



struct ipx_interface_definition {

	__u32         ipx_network;

	__be32        ipx_network;

	unsigned char ipx_device[16];

	unsigned char ipx_dlink_type;

#define IPX_FRAME_NONE		0
@@ -55,8 +55,8 @@ struct ipx_config_data { 
 */



struct ipx_route_def {

	__u32		ipx_network;

	__u32		ipx_router_network;

	__be32		ipx_network;

	__be32		ipx_router_network;

#define IPX_ROUTE_NO_ROUTER	0

	unsigned char	ipx_router_node[IPX_NODE_LEN];

	unsigned char	ipx_device[16];

include/net/inet_ecn.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner) 


#define	IP6_ECN_flow_xmit(sk, label) do {				\

	if (INET_ECN_is_capable(inet_sk(sk)->tos))			\

		(label) |= __constant_htons(INET_ECN_ECT_0 << 4);	\

		(label) |= htonl(INET_ECN_ECT_0 << 20);			\

    } while (0)



static inline int IP_ECN_set_ce(struct iphdr *iph)

include/net/ipx.h

+13 −13
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ 
#include <linux/list.h>



struct ipx_address {

	__u32   net;

	__be32  net;

	__u8    node[IPX_NODE_LEN]; 

	__u16   sock;

	__be16  sock;

};



#define ipx_broadcast_node	"\377\377\377\377\377\377"
@@ -26,9 +26,9 @@ struct ipx_address { 
#define IPX_MAX_PPROP_HOPS 8



struct ipxhdr {

	__u16			ipx_checksum __attribute__ ((packed));

#define IPX_NO_CHECKSUM	0xFFFF

	__u16			ipx_pktsize __attribute__ ((packed));

	__be16			ipx_checksum __attribute__ ((packed));

#define IPX_NO_CHECKSUM	__constant_htons(0xFFFF)

	__be16			ipx_pktsize __attribute__ ((packed));

	__u8			ipx_tctrl;

	__u8			ipx_type;

#define IPX_TYPE_UNKNOWN	0x00
@@ -48,14 +48,14 @@ static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb) 


struct ipx_interface {

	/* IPX address */

	__u32			if_netnum;

	__be32			if_netnum;

	unsigned char		if_node[IPX_NODE_LEN];

	atomic_t		refcnt;



	/* physical device info */

	struct net_device	*if_dev;

	struct datalink_proto	*if_dlink;

	unsigned short		if_dlink_type;

	__be16			if_dlink_type;



	/* socket support */

	unsigned short		if_sknum;
@@ -71,7 +71,7 @@ struct ipx_interface { 
};



struct ipx_route {

	__u32			ir_net;

	__be32			ir_net;

	struct ipx_interface	*ir_intrfc;

	unsigned char		ir_routed;

	unsigned char		ir_router_node[IPX_NODE_LEN];
@@ -82,10 +82,10 @@ struct ipx_route { 
#ifdef __KERNEL__

struct ipx_cb {

	u8	ipx_tctrl;

	u32	ipx_dest_net;

	u32	ipx_source_net;

	__be32	ipx_dest_net;

	__be32	ipx_source_net;

	struct {

		u32 netnum;

		__be32 netnum;

		int index;

	} last_hop;

};
@@ -97,7 +97,7 @@ struct ipx_sock { 
	struct sock		sk;

	struct ipx_address	dest_addr;

	struct ipx_interface	*intrfc;

	unsigned short		port;

	__be16			port;

#ifdef CONFIG_IPX_INTERN

	unsigned char		node[IPX_NODE_LEN];

#endif
@@ -132,7 +132,7 @@ extern struct ipx_interface *ipx_primary_net; 
extern int ipx_proc_init(void);

extern void ipx_proc_exit(void);



extern const char *ipx_frame_name(unsigned short);

extern const char *ipx_frame_name(__be16);

extern const char *ipx_device_name(struct ipx_interface *intrfc);



static __inline__ void ipxitf_hold(struct ipx_interface *intrfc)

net/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ config INET 
if INET

source "net/ipv4/Kconfig"

source "net/ipv6/Kconfig"

source "net/netlabel/Kconfig"



endif # if INET
@@ -249,8 +250,6 @@ source "net/ieee80211/Kconfig" 
config WIRELESS_EXT

	bool



source "net/netlabel/Kconfig"



config FIB_RULES

	bool