diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-05 21:03:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-05 21:03:31 -0700 |
| commit | 4ce2417bfb3c7b1c5ed449782f4d86bafd7f1b69 (patch) | |
| tree | 5f890cc41654e6381ff7d0264a83f2c79b7ea66c /include | |
| parent | 32cb5b4e035e3d7b52f1e9de87920645a00e5234 (diff) | |
| parent | 055e5110ae0c0c1176a75b78d789294f2ff2f7af (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hdlc.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h index 6115545a5b9..c59769693be 100644 --- a/include/linux/hdlc.h +++ b/include/linux/hdlc.h @@ -45,7 +45,6 @@ struct hdlc_proto { /* Pointed to by dev->priv */ typedef struct hdlc_device { - struct net_device_stats stats; /* used by HDLC layer to take control over HDLC device from hw driver*/ int (*attach)(struct net_device *dev, unsigned short encoding, unsigned short parity); @@ -109,12 +108,6 @@ int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto, /* May be used by hardware driver to gain control over HDLC device */ void detach_hdlc_protocol(struct net_device *dev); -static __inline__ struct net_device_stats *hdlc_stats(struct net_device *dev) -{ - return &dev_to_hdlc(dev)->stats; -} - - static __inline__ __be16 hdlc_type_trans(struct sk_buff *skb, struct net_device *dev) { |