diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
| commit | cb18eccff48ef3986d1072964590bce6fec705fb (patch) | |
| tree | 777fb1d15e0281341e1e02c9803d989538d346f2 /net/ethernet/eth.c | |
| parent | c827ba4cb49a30ce581201fd0ba2be77cde412c7 (diff) | |
| parent | 5ef213f6842277ee1df5659f59fac0ffc9beb411 (diff) | |
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: (45 commits)
[IPV4]: Restore multipath routing after rt_next changes.
[XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
[NET]: Reorder fields of struct dst_entry
[DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
[IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
[IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
[NET]: Introduce union in struct dst_entry to hold 'next' pointer
[DECNET]: fix misannotation of linkinfo_dn
[DECNET]: FRA_{DST,SRC} are le16 for decnet
[UDP]: UDP can use sk_hash to speedup lookups
[NET]: Fix whitespace errors.
[NET] XFRM: Fix whitespace errors.
[NET] X25: Fix whitespace errors.
[NET] WANROUTER: Fix whitespace errors.
[NET] UNIX: Fix whitespace errors.
[NET] TIPC: Fix whitespace errors.
[NET] SUNRPC: Fix whitespace errors.
[NET] SCTP: Fix whitespace errors.
[NET] SCHED: Fix whitespace errors.
[NET] RXRPC: Fix whitespace errors.
...
Diffstat (limited to 'net/ethernet/eth.c')
| -rw-r--r-- | net/ethernet/eth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 2d31bf3f05c..766a0b59c0d 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c | |||
| @@ -12,14 +12,14 @@ | |||
| 12 | * Mark Evans, <evansmp@uhura.aston.ac.uk> | 12 | * Mark Evans, <evansmp@uhura.aston.ac.uk> |
| 13 | * Florian La Roche, <rzsfl@rz.uni-sb.de> | 13 | * Florian La Roche, <rzsfl@rz.uni-sb.de> |
| 14 | * Alan Cox, <gw4pts@gw4pts.ampr.org> | 14 | * Alan Cox, <gw4pts@gw4pts.ampr.org> |
| 15 | * | 15 | * |
| 16 | * Fixes: | 16 | * Fixes: |
| 17 | * Mr Linux : Arp problems | 17 | * Mr Linux : Arp problems |
| 18 | * Alan Cox : Generic queue tidyup (very tiny here) | 18 | * Alan Cox : Generic queue tidyup (very tiny here) |
| 19 | * Alan Cox : eth_header ntohs should be htons | 19 | * Alan Cox : eth_header ntohs should be htons |
| 20 | * Alan Cox : eth_rebuild_header missing an htons and | 20 | * Alan Cox : eth_rebuild_header missing an htons and |
| 21 | * minor other things. | 21 | * minor other things. |
| 22 | * Tegge : Arp bug fixes. | 22 | * Tegge : Arp bug fixes. |
| 23 | * Florian : Removed many unnecessary functions, code cleanup | 23 | * Florian : Removed many unnecessary functions, code cleanup |
| 24 | * and changes for new arp and skbuff. | 24 | * and changes for new arp and skbuff. |
| 25 | * Alan Cox : Redid header building to reflect new format. | 25 | * Alan Cox : Redid header building to reflect new format. |
| @@ -307,9 +307,9 @@ void ether_setup(struct net_device *dev) | |||
| 307 | dev->hard_header_len = ETH_HLEN; | 307 | dev->hard_header_len = ETH_HLEN; |
| 308 | dev->mtu = ETH_DATA_LEN; | 308 | dev->mtu = ETH_DATA_LEN; |
| 309 | dev->addr_len = ETH_ALEN; | 309 | dev->addr_len = ETH_ALEN; |
| 310 | dev->tx_queue_len = 1000; /* Ethernet wants good queues */ | 310 | dev->tx_queue_len = 1000; /* Ethernet wants good queues */ |
| 311 | dev->flags = IFF_BROADCAST|IFF_MULTICAST; | 311 | dev->flags = IFF_BROADCAST|IFF_MULTICAST; |
| 312 | 312 | ||
| 313 | memset(dev->broadcast, 0xFF, ETH_ALEN); | 313 | memset(dev->broadcast, 0xFF, ETH_ALEN); |
| 314 | 314 | ||
| 315 | } | 315 | } |