From patchwork Thu Oct 21 11:26:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 440 Return-Path: Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22]) by open-mesh.org (Postfix) with SMTP id 5E0AB15456A for ; Thu, 21 Oct 2010 13:26:01 +0200 (CEST) Received: (qmail invoked by alias); 21 Oct 2010 11:26:00 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [89.246.214.255] by mail.gmx.net (mp018) with SMTP; 21 Oct 2010 13:26:00 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1/tzv0jx/ntPvDbXHmJ6sg9Ap3acDfdi3XUhN3Kpb EYQIYF/dxMAnoS From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 21 Oct 2010 13:26:51 +0200 Message-Id: <1287660411-4238-2-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1287660411-4238-1-git-send-email-sven.eckelmann@gmx.de> References: <1287660411-4238-1-git-send-email-sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Cleanup compat.h X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2010 11:26:01 -0000 Following functions/defines were declared more than once: * skb_mac_header Following functions/defines weren't used anymore: * skb_clone_writable * dev_get_stats Signed-off-by: Sven Eckelmann --- batman-adv/compat.h | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/batman-adv/compat.h b/batman-adv/compat.h index 5c02b44..da474e4 100644 --- a/batman-adv/compat.h +++ b/batman-adv/compat.h @@ -46,9 +46,6 @@ #define skb_mac_header(_skb) \ ((_skb)->mac.raw) -#define skb_mac_header(_skb) \ - ((_skb)->mac.raw) - #include static inline __be16 bat_eth_type_trans(struct sk_buff *skb, struct net_device *dev) @@ -64,12 +61,6 @@ static inline __be16 bat_eth_type_trans(struct sk_buff *skb, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) -static inline int skb_clone_writable(struct sk_buff *skb, unsigned int len) -{ - /* skb->hdr_len not available, just "not writable" to enforce a copy */ - return 0; -} - static inline int skb_cow_head(struct sk_buff *skb, unsigned int headroom) { return skb_cow(skb, headroom); @@ -268,14 +259,6 @@ int bat_sprintf(char *buf, const char *fmt, ...); int bat_snprintf(char *buf, size_t size, const char *fmt, ...); #define snprintf bat_snprintf -static inline struct net_device_stats *dev_get_stats(struct net_device *dev) -{ - if (dev->get_stats) - return dev->get_stats(dev); - else - return NULL; -} - #endif /* < KERNEL_VERSION(2, 6, 29) */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */