diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-02 00:32:56 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-02 00:32:56 -0700 |
commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /net/sched/sch_atm.c | |
parent | ipv6: ip6_push_pending_frames() should increment IPSTATS_MIB_OUTDISCARDS (diff) | |
parent | pkt_sched: Revert tasklet_hrtimer changes. (diff) | |
download | linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.tar.gz linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.tar.bz2 linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
Diffstat (limited to 'net/sched/sch_atm.c')
-rw-r--r-- | net/sched/sch_atm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 2a8b83af7c47..ab82f145f689 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -49,7 +49,7 @@ struct atm_flow_data { struct socket *sock; /* for closing */ u32 classid; /* x:y type ID */ int ref; /* reference count */ - struct gnet_stats_basic bstats; + struct gnet_stats_basic_packed bstats; struct gnet_stats_queue qstats; struct atm_flow_data *next; struct atm_flow_data *excess; /* flow for excess traffic; |