GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linus Torvalds 2005-05-23 14:57:14 -07:00
commit ab3fc40363
8 changed files with 25 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crypto/internal.h
View file

@ -38,7 +38,7 @@ static inline void crypto_kunmap(void *vaddr, int out)
static inline void crypto_yield(struct crypto_tfm *tfm) static inline void crypto_yield(struct crypto_tfm *tfm)
{ {
if (!in_softirq()) if (!in_atomic())
cond_resched(); cond_resched();
} }

8
drivers/net/tg3.c
View file

@ -61,8 +61,8 @@
#define DRV_MODULE_NAME "tg3" #define DRV_MODULE_NAME "tg3"
#define PFX DRV_MODULE_NAME ": " #define PFX DRV_MODULE_NAME ": "
#define DRV_MODULE_VERSION "3.27" #define DRV_MODULE_VERSION "3.29"
#define DRV_MODULE_RELDATE "May 5, 2005" #define DRV_MODULE_RELDATE "May 23, 2005"
#define TG3_DEF_MAC_MODE 0 #define TG3_DEF_MAC_MODE 0
#define TG3_DEF_RX_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_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, 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_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753M, { 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; return ret;
} }
#define TEST_BUFFER_SIZE 0x400 #define TEST_BUFFER_SIZE 0x2000
static int __devinit tg3_test_dma(struct tg3 *tp) static int __devinit tg3_test_dma(struct tg3 *tp)
{ {

39
include/linux/if_tr.h
View file

@ -9,7 +9,7 @@
* *
* Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
* Donald Becker, <becker@super.org> * Donald Becker, <becker@super.org>
* Peter De Schrijver, <stud11@cc4.kuleuven.ac.be> * Peter De Schrijver, <stud11@cc4.kuleuven.ac.be>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -19,24 +19,16 @@
#ifndef _LINUX_IF_TR_H #ifndef _LINUX_IF_TR_H
#define _LINUX_IF_TR_H #define _LINUX_IF_TR_H
/* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble /* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble
and FCS/CRC (frame check sequence). */ 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 TR_HLEN (sizeof(struct trh_hdr)+sizeof(struct trllc))
#define AC 0x10 #define AC 0x10
#define LLC_FRAME 0x40 #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 */ /* LLC and SNAP constants */
#define EXTENDED_SAP 0xAA #define EXTENDED_SAP 0xAA
#define UI_CMD 0x03 #define UI_CMD 0x03
/* This is an Token-Ring frame header. */ /* This is an Token-Ring frame header. */
struct trh_hdr { struct trh_hdr {
@ -96,14 +88,13 @@ struct tr_statistics {
}; };
/* source routing stuff */ /* source routing stuff */
#define TR_RII 0x80
#define TR_RII 0x80 #define TR_RCF_DIR_BIT 0x80
#define TR_RCF_DIR_BIT 0x80 #define TR_RCF_LEN_MASK 0x1f00
#define TR_RCF_LEN_MASK 0x1f00 #define TR_RCF_BROADCAST 0x8000 /* all-routes broadcast */
#define TR_RCF_BROADCAST 0x8000 /* all-routes broadcast */ #define TR_RCF_LIMITED_BROADCAST 0xC000 /* single-route broadcast */
#define TR_RCF_LIMITED_BROADCAST 0xC000 /* single-route broadcast */ #define TR_RCF_FRAME2K 0x20
#define TR_RCF_FRAME2K 0x20 #define TR_RCF_BROADCAST_MASK 0xC000
#define TR_RCF_BROADCAST_MASK 0xC000 #define TR_MAXRIFLEN 18
#define TR_MAXRIFLEN 18
#endif /* _LINUX_IF_TR_H */ #endif /* _LINUX_IF_TR_H */

1
include/linux/net.h
View file

@ -101,7 +101,6 @@ enum sock_type {
* @sk: internal networking protocol agnostic socket representation * @sk: internal networking protocol agnostic socket representation
* @wait: wait queue for several uses * @wait: wait queue for several uses
* @type: socket type (%SOCK_STREAM, etc) * @type: socket type (%SOCK_STREAM, etc)
* @passcred: credentials (used only in Unix Sockets (aka PF_LOCAL))
*/ */
struct socket { struct socket {
socket_state state; socket_state state;

2
include/linux/netdevice.h
View file

@ -503,7 +503,7 @@ static inline void *netdev_priv(struct net_device *dev)
#define SET_NETDEV_DEV(net, pdev) ((net)->class_dev.dev = (pdev)) #define SET_NETDEV_DEV(net, pdev) ((net)->class_dev.dev = (pdev))
struct packet_type { 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 */ struct net_device *dev; /* NULL is wildcarded here */
int (*func) (struct sk_buff *, struct net_device *, int (*func) (struct sk_buff *, struct net_device *,
struct packet_type *); struct packet_type *);

1
include/linux/pci_ids.h
View file

@ -2064,6 +2064,7 @@
#define PCI_VENDOR_ID_BROADCOM 0x14e4 #define PCI_VENDOR_ID_BROADCOM 0x14e4
#define PCI_DEVICE_ID_TIGON3_5752 0x1600 #define PCI_DEVICE_ID_TIGON3_5752 0x1600
#define PCI_DEVICE_ID_TIGON3_5752M 0x1601
#define PCI_DEVICE_ID_TIGON3_5700 0x1644 #define PCI_DEVICE_ID_TIGON3_5700 0x1644
#define PCI_DEVICE_ID_TIGON3_5701 0x1645 #define PCI_DEVICE_ID_TIGON3_5701 0x1645
#define PCI_DEVICE_ID_TIGON3_5702 0x1646 #define PCI_DEVICE_ID_TIGON3_5702 0x1646

11
net/ipv4/tcp_input.c
View file

@ -4355,16 +4355,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
goto no_ack; goto no_ack;
} }
if (eaten) { __tcp_ack_snd_check(sk, 0);
if (tcp_in_quickack_mode(tp)) {
tcp_send_ack(sk);
} else {
tcp_send_delayed_ack(sk);
}
} else {
__tcp_ack_snd_check(sk, 0);
}
no_ack: no_ack:
if (eaten) if (eaten)
__kfree_skb(skb); __kfree_skb(skb);

1
net/ipv6/xfrm6_output.c
View file

@ -84,6 +84,7 @@ static int xfrm6_tunnel_check_size(struct sk_buff *skb)
mtu = IPV6_MIN_MTU; mtu = IPV6_MIN_MTU;
if (skb->len > mtu) { if (skb->len > mtu) {
skb->dev = dst->dev;
icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, skb->dev); icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, skb->dev);
ret = -EMSGSIZE; ret = -EMSGSIZE;
} }