diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
| commit | 8244132ea89cdd128003f5b9980fab50d8d36d72 (patch) | |
| tree | c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95 /net/sched | |
| parent | 7b2ff18ee7b0ec4bc3162f821e221781aaca48bd (diff) | |
| parent | 38000a94a902e94ca8b5498f7871c6316de8957a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/ip_output.c
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_teql.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 3415b6ce1c0a..807643bdcbac 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
| @@ -449,6 +449,7 @@ static __init void teql_master_setup(struct net_device *dev) | |||
| 449 | dev->tx_queue_len = 100; | 449 | dev->tx_queue_len = 100; |
| 450 | dev->flags = IFF_NOARP; | 450 | dev->flags = IFF_NOARP; |
| 451 | dev->hard_header_len = LL_MAX_HEADER; | 451 | dev->hard_header_len = LL_MAX_HEADER; |
| 452 | dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; | ||
| 452 | } | 453 | } |
| 453 | 454 | ||
| 454 | static LIST_HEAD(master_dev_list); | 455 | static LIST_HEAD(master_dev_list); |