Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (36177ba6) · Commits · 戴 / test

drivers/net/tg3.c

+25 −7

Original line number	Diff line number	Diff line
		@@ -69,8 +69,8 @@

		#define DRV_MODULE_NAME "tg3"
		#define PFX DRV_MODULE_NAME ": "
		#define DRV_MODULE_VERSION "3.52"
		#define DRV_MODULE_RELDATE "Mar 06, 2006"
		#define DRV_MODULE_VERSION "3.53"
		#define DRV_MODULE_RELDATE "Mar 22, 2006"

		#define TG3_DEF_MAC_MODE 0
		#define TG3_DEF_RX_MODE 0
		@@ -1148,6 +1148,19 @@ static int tg3_halt_cpu(struct tg3 *, u32);
		static int tg3_nvram_lock(struct tg3 *);
		static void tg3_nvram_unlock(struct tg3 *);

		static void tg3_power_down_phy(struct tg3 *tp)
		{
		/* The PHY should not be powered down on some chips because
		* of bugs.
		*/
		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 \|\|
		GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 \|\|
		(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780 &&
		(tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
		return;
		tg3_writephy(tp, MII_BMCR, BMCR_PDOWN);
		}

		static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
		{
		u32 misc_host_ctrl;
		@@ -1327,8 +1340,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
		tg3_writephy(tp, MII_TG3_EXT_CTRL,
		MII_TG3_EXT_CTRL_FORCE_LED_OFF);
		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x01b2);
		if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700)
		tg3_writephy(tp, MII_BMCR, BMCR_PDOWN);
		tg3_power_down_phy(tp);
		}
		}

		@@ -9436,12 +9448,18 @@ static inline struct subsys_tbl_ent lookup_by_subsys(struct tg3 tp)
		return NULL;
		}

		/* Since this function may be called in D3-hot power state during
		* tg3_init_one(), only config cycles are allowed.
		*/
		static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
		{
		u32 val;
		u16 pmcsr;

		/* On some early chips the SRAM cannot be accessed in D3hot state,
		* so need make sure we're in D0.
		*/
		pci_read_config_word(tp->pdev, tp->pm_cap + PCI_PM_CTRL, &pmcsr);
		pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
		pci_write_config_word(tp->pdev, tp->pm_cap + PCI_PM_CTRL, pmcsr);
		msleep(1);

		/* Make sure register accesses (indirect or otherwise)
		* will function correctly.

include/linux/net.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,8 @@ struct proto_ops {
		struct poll_table_struct *wait);
		int (ioctl) (struct socket sock, unsigned int cmd,
		unsigned long arg);
		int (compat_ioctl) (struct socket sock, unsigned int cmd,
		unsigned long arg);
		int (listen) (struct socket sock, int len);
		int (shutdown) (struct socket sock, int flags);
		int (setsockopt)(struct socket sock, int level,
		@@ -251,6 +253,8 @@ SOCKCALL_UWRAP(name, poll, (struct file file, struct socket sock, struct poll_
		(file, sock, wait)) \
		SOCKCALL_WRAP(name, ioctl, (struct socket *sock, unsigned int cmd, \
		unsigned long arg), (sock, cmd, arg)) \
		SOCKCALL_WRAP(name, compat_ioctl, (struct socket *sock, unsigned int cmd, \
		unsigned long arg), (sock, cmd, arg)) \
		SOCKCALL_WRAP(name, listen, (struct socket *sock, int len), (sock, len)) \
		SOCKCALL_WRAP(name, shutdown, (struct socket *sock, int flags), (sock, flags)) \
		SOCKCALL_WRAP(name, setsockopt, (struct socket *sock, int level, int optname, \
		@@ -275,6 +279,7 @@ static const struct proto_ops name##_ops = { \
		.getname = __lock_##name##_getname, \
		.poll = __lock_##name##_poll, \
		.ioctl = __lock_##name##_ioctl, \
		.compat_ioctl = __lock_##name##_compat_ioctl, \
		.listen = __lock_##name##_listen, \
		.shutdown = __lock_##name##_shutdown, \
		.setsockopt = __lock_##name##_setsockopt, \
		@@ -283,6 +288,7 @@ static const struct proto_ops name##_ops = { \
		.recvmsg = __lock_##name##_recvmsg, \
		.mmap = __lock_##name##_mmap, \
		};

		#endif

		#define MODULE_ALIAS_NETPROTO(proto) \

include/linux/x25.h

+26 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@
		#ifndef X25_KERNEL_H
		#define X25_KERNEL_H

		#include <linux/types.h>

		#define SIOCX25GSUBSCRIP (SIOCPROTOPRIVATE + 0)
		#define SIOCX25SSUBSCRIP (SIOCPROTOPRIVATE + 1)
		#define SIOCX25GFACILITIES (SIOCPROTOPRIVATE + 2)
		@@ -21,6 +23,8 @@
		#define SIOCX25SCUDMATCHLEN (SIOCPROTOPRIVATE + 7)
		#define SIOCX25CALLACCPTAPPRV (SIOCPROTOPRIVATE + 8)
		#define SIOCX25SENDCALLACCPT (SIOCPROTOPRIVATE + 9)
		#define SIOCX25GDTEFACILITIES (SIOCPROTOPRIVATE + 10)
		#define SIOCX25SDTEFACILITIES (SIOCPROTOPRIVATE + 11)

		/*
		* Values for {get,set}sockopt.
		@@ -77,6 +81,8 @@ struct x25_subscrip_struct {
		#define X25_MASK_PACKET_SIZE 0x04
		#define X25_MASK_WINDOW_SIZE 0x08

		#define X25_MASK_CALLING_AE 0x10
		#define X25_MASK_CALLED_AE 0x20


		/*
		@@ -98,6 +104,26 @@ struct x25_facilities {
		unsigned int reverse;
		};

		/*
		* ITU DTE facilities
		* Only the called and calling address
		* extension are currently implemented.
		* The rest are in place to avoid the struct
		* changing size if someone needs them later
		*/

		struct x25_dte_facilities {
		__u16 delay_cumul;
		__u16 delay_target;
		__u16 delay_max;
		__u8 min_throughput;
		__u8 expedited;
		__u8 calling_len;
		__u8 called_len;
		__u8 calling_ae[20];
		__u8 called_ae[20];
		};

		/*
		* Call User Data structure.
		*/

include/net/compat.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,9 @@ struct compat_cmsghdr {
		compat_int_t cmsg_type;
		};

		struct sock;
		extern int compat_sock_get_timestamp(struct sock , struct timeval __user );

		#else /* defined(CONFIG_COMPAT) */
		#define compat_msghdr msghdr /* to avoid compiler warnings */
		#endif /* defined(CONFIG_COMPAT) */
		@@ -34,7 +37,6 @@ extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsi
		extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user , int __user );
		extern int put_cmsg_compat(struct msghdr, int, int, int, void );

		struct sock;
		extern int cmsghdr_from_user_compat_to_kern(struct msghdr , struct sock , unsigned char *, int);

		#endif /* NET_COMPAT_H */

include/net/x25.h

+17 −4

Original line number	Diff line number	Diff line
		@@ -101,9 +101,17 @@ enum {
		#define X25_FAC_PACKET_SIZE 0x42
		#define X25_FAC_WINDOW_SIZE 0x43

		#define X25_MAX_FAC_LEN 20 /* Plenty to spare */
		#define X25_MAX_FAC_LEN 60
		#define X25_MAX_CUD_LEN 128

		#define X25_FAC_CALLING_AE 0xCB
		#define X25_FAC_CALLED_AE 0xC9

		#define X25_MARKER 0x00
		#define X25_DTE_SERVICES 0x0F
		#define X25_MAX_AE_LEN 40 /* Max num of semi-octets in AE - OSI Nw */
		#define X25_MAX_DTE_FACIL_LEN 21 /* Max length of DTE facility params */

		/**
		* struct x25_route - x25 routing entry
		* @node - entry in x25_list_lock
		@@ -148,6 +156,7 @@ struct x25_sock {
		struct timer_list timer;
		struct x25_causediag causediag;
		struct x25_facilities facilities;
		struct x25_dte_facilities dte_facilities;
		struct x25_calluserdata calluserdata;
		unsigned long vc_facil_mask; /* inc_call facilities mask */
		};
		@@ -180,9 +189,13 @@ extern void x25_establish_link(struct x25_neigh *);
		extern void x25_terminate_link(struct x25_neigh *);

		/* x25_facilities.c */
		extern int x25_parse_facilities(struct sk_buff , struct x25_facilities , unsigned long *);
		extern int x25_create_facilities(unsigned char , struct x25_facilities , unsigned long);
		extern int x25_negotiate_facilities(struct sk_buff , struct sock , struct x25_facilities *);
		extern int x25_parse_facilities(struct sk_buff , struct x25_facilities ,
		struct x25_dte_facilities , unsigned long );
		extern int x25_create_facilities(unsigned char , struct x25_facilities ,
		struct x25_dte_facilities *, unsigned long);
		extern int x25_negotiate_facilities(struct sk_buff , struct sock ,
		struct x25_facilities *,
		struct x25_dte_facilities *);
		extern void x25_limit_facilities(struct x25_facilities , struct x25_neigh );

		/* x25_in.c */

Admin message