diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:15:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:15:23 -0400 |
commit | f2d7499be1b1fe1cd8a5e6a01c1f44173894a241 (patch) | |
tree | 64d341a90d8cb831a5097e365d303367906f1373 /include/net/syncppp.h | |
parent | 8d659f5e43c5db2630e85f507b7384365e9e1c1e (diff) | |
parent | 76aab2c1eae491a5d73ac83deec97dd28ebac584 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (99 commits)
pkt_sched: Fix actions referencing
bnx2x: fix logical op
tcp: (whitespace only) fix confusing indentation
pkt_sched: Fix qdisc config when link is down.
[Bluetooth] Add full quirk implementation for btusb driver
[Bluetooth] Removal of unnecessary ignore module parameter
[Bluetooth] Add parameters to control BNEP header compression
ath9k: Revamp wireless mode usage
ath9k: More unused macros
ath9k: Remove a few unused macros and fix indentation
ath9k: Use mac80211's band macros and remove enum hal_freq_band
ath9k: Remove redundant data structure ath9k_txq_info
ath9k: Cleanup data structures related to HW capabilities
ath9k: work around gcc ICEs
ath9k: Add new Atheros IEEE 802.11n driver
ath5k: remove Atheros 11n devices from supported list
list.h: add list_cut_position()
list.h: Add list_splice_tail() and list_splice_tail_init()
p54: swap short slot time dcf values
rt2x00: Block all unsupported modes
...
Diffstat (limited to 'include/net/syncppp.h')
-rw-r--r-- | include/net/syncppp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/syncppp.h b/include/net/syncppp.h index e43f4070d892..9e306f7f579a 100644 --- a/include/net/syncppp.h +++ b/include/net/syncppp.h | |||
@@ -43,8 +43,6 @@ struct sppp | |||
43 | u32 pp_rseq; /* remote sequence number */ | 43 | u32 pp_rseq; /* remote sequence number */ |
44 | struct slcp lcp; /* LCP params */ | 44 | struct slcp lcp; /* LCP params */ |
45 | struct sipcp ipcp; /* IPCP params */ | 45 | struct sipcp ipcp; /* IPCP params */ |
46 | u32 ibytes,obytes; /* Bytes in/out */ | ||
47 | u32 ipkts,opkts; /* Packets in/out */ | ||
48 | struct timer_list pp_timer; | 46 | struct timer_list pp_timer; |
49 | struct net_device *pp_if; | 47 | struct net_device *pp_if; |
50 | char pp_link_state; /* Link status */ | 48 | char pp_link_state; /* Link status */ |