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

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

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

parents f10d20c1 d1faeaeb

crypto/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static inline void crypto_kunmap(void *vaddr, int out) 


static inline void crypto_yield(struct crypto_tfm *tfm)

{

	if (!in_softirq())

	if (!in_atomic())

		cond_resched();

}

drivers/net/tg3.c

+5 −3
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.27"

#define DRV_MODULE_RELDATE	"May 5, 2005"

#define DRV_MODULE_VERSION	"3.29"

#define DRV_MODULE_RELDATE	"May 23, 2005"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -206,6 +206,8 @@ static struct pci_device_id tg3_pci_tbl[] = { 
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752M,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753M,
@@ -8994,7 +8996,7 @@ static int __devinit tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dm 
	return ret;

}



#define TEST_BUFFER_SIZE	0x400

#define TEST_BUFFER_SIZE	0x2000



static int __devinit tg3_test_dma(struct tg3 *tp)

{

include/linux/if_tr.h

+15 −24
Original line number Diff line number Diff line
@@ -19,20 +19,12 @@ 
#ifndef _LINUX_IF_TR_H

#define _LINUX_IF_TR_H





/* IEEE 802.5 Token-Ring magic constants.  The frame sizes omit the preamble

   and FCS/CRC (frame check sequence). */

#define TR_ALEN	6		/* Octets in one ethernet addr	 */

#define TR_ALEN		6		/* Octets in one token-ring addr */

#define TR_HLEN 	(sizeof(struct trh_hdr)+sizeof(struct trllc))

#define AC		0x10

#define LLC_FRAME 	0x40

#if 0

#define ETH_HLEN	14		/* Total octets in header.	 */

#define ETH_ZLEN	60		/* Min. octets in frame sans FCS */

#define ETH_DATA_LEN	1500		/* Max. octets in payload	 */

#define ETH_FRAME_LEN	1514		/* Max. octets in frame sans FCS */

#endif





/* LLC and SNAP constants */

#define EXTENDED_SAP 	0xAA
@@ -96,7 +88,6 @@ struct tr_statistics { 
};



/* source routing stuff */



#define TR_RII 			0x80

#define TR_RCF_DIR_BIT 		0x80

#define TR_RCF_LEN_MASK 	0x1f00

include/linux/net.h

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ enum sock_type { 
 *  @sk: internal networking protocol agnostic socket representation

 *  @wait: wait queue for several uses

 *  @type: socket type (%SOCK_STREAM, etc)

 *  @passcred: credentials (used only in Unix Sockets (aka PF_LOCAL))

 */

struct socket {

	socket_state		state;

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static inline void *netdev_priv(struct net_device *dev) 
#define SET_NETDEV_DEV(net, pdev)	((net)->class_dev.dev = (pdev))



struct packet_type {

	unsigned short		type;	/* This is really htons(ether_type).	*/

	__be16			type;	/* This is really htons(ether_type).	*/

	struct net_device		*dev;	/* NULL is wildcarded here		*/

	int			(*func) (struct sk_buff *, struct net_device *,

					 struct packet_type *);