diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-21 04:32:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-21 04:32:26 -0400 |
| commit | e5e9743bb7429f53c83ad69b432f7b661e74c3f0 (patch) | |
| tree | db3691aef0d46c4aed4a2be6dc8ab7c44c3488cb /net/core/dev.c | |
| parent | a0f82f64e26929776c58a5c93c2ecb38e3d82815 (diff) | |
| parent | 775d8d931581764a1ec982ebe5a927b12762fb6d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index cfc614ec3719..e48c08af76ad 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1336,7 +1336,12 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev) | |||
| 1336 | { | 1336 | { |
| 1337 | struct packet_type *ptype; | 1337 | struct packet_type *ptype; |
| 1338 | 1338 | ||
| 1339 | #ifdef CONFIG_NET_CLS_ACT | ||
| 1340 | if (!(skb->tstamp.tv64 && (G_TC_FROM(skb->tc_verd) & AT_INGRESS))) | ||
| 1341 | net_timestamp(skb); | ||
| 1342 | #else | ||
| 1339 | net_timestamp(skb); | 1343 | net_timestamp(skb); |
| 1344 | #endif | ||
| 1340 | 1345 | ||
| 1341 | rcu_read_lock(); | 1346 | rcu_read_lock(); |
| 1342 | list_for_each_entry_rcu(ptype, &ptype_all, list) { | 1347 | list_for_each_entry_rcu(ptype, &ptype_all, list) { |
| @@ -4391,7 +4396,7 @@ int register_netdevice(struct net_device *dev) | |||
| 4391 | dev->iflink = -1; | 4396 | dev->iflink = -1; |
| 4392 | 4397 | ||
| 4393 | #ifdef CONFIG_COMPAT_NET_DEV_OPS | 4398 | #ifdef CONFIG_COMPAT_NET_DEV_OPS |
| 4394 | /* Netdevice_ops API compatiability support. | 4399 | /* Netdevice_ops API compatibility support. |
| 4395 | * This is temporary until all network devices are converted. | 4400 | * This is temporary until all network devices are converted. |
| 4396 | */ | 4401 | */ |
| 4397 | if (dev->netdev_ops) { | 4402 | if (dev->netdev_ops) { |
| @@ -4402,7 +4407,7 @@ int register_netdevice(struct net_device *dev) | |||
| 4402 | dev->name, netdev_drivername(dev, drivername, 64)); | 4407 | dev->name, netdev_drivername(dev, drivername, 64)); |
| 4403 | 4408 | ||
| 4404 | /* This works only because net_device_ops and the | 4409 | /* This works only because net_device_ops and the |
| 4405 | compatiablity structure are the same. */ | 4410 | compatibility structure are the same. */ |
| 4406 | dev->netdev_ops = (void *) &(dev->init); | 4411 | dev->netdev_ops = (void *) &(dev->init); |
| 4407 | } | 4412 | } |
| 4408 | #endif | 4413 | #endif |