aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2006-01-14 16:20:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 21:27:06 -0500
commit858119e159384308a5dde67776691a2ebf70df0f (patch)
treef360768f999d51edc0863917ce0bf79e88c0ec4c /net
parentb0a9499c3dd50d333e2aedb7e894873c58da3785 (diff)
[PATCH] Unlinline a bunch of other functions
Remove the "inline" keyword from a bunch of big functions in the kernel with the goal of shrinking it by 30kb to 40kb Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
-rw-r--r--net/ieee80211/ieee80211_module.c4
-rw-r--r--net/ieee80211/ieee80211_rx.c14
-rw-r--r--net/ieee80211/ieee80211_tx.c4
-rw-r--r--net/ieee80211/ieee80211_wx.c2
-rw-r--r--net/netfilter/nfnetlink.c2
5 files changed, 13 insertions, 13 deletions
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index 321287bc887..90d18b72da3 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -62,7 +62,7 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
62MODULE_AUTHOR(DRV_COPYRIGHT); 62MODULE_AUTHOR(DRV_COPYRIGHT);
63MODULE_LICENSE("GPL"); 63MODULE_LICENSE("GPL");
64 64
65static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee) 65static int ieee80211_networks_allocate(struct ieee80211_device *ieee)
66{ 66{
67 if (ieee->networks) 67 if (ieee->networks)
68 return 0; 68 return 0;
@@ -90,7 +90,7 @@ static inline void ieee80211_networks_free(struct ieee80211_device *ieee)
90 ieee->networks = NULL; 90 ieee->networks = NULL;
91} 91}
92 92
93static inline void ieee80211_networks_initialize(struct ieee80211_device *ieee) 93static void ieee80211_networks_initialize(struct ieee80211_device *ieee)
94{ 94{
95 int i; 95 int i;
96 96
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 5e338038804..7a121802faa 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -35,7 +35,7 @@
35 35
36#include <net/ieee80211.h> 36#include <net/ieee80211.h>
37 37
38static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee, 38static void ieee80211_monitor_rx(struct ieee80211_device *ieee,
39 struct sk_buff *skb, 39 struct sk_buff *skb,
40 struct ieee80211_rx_stats *rx_stats) 40 struct ieee80211_rx_stats *rx_stats)
41{ 41{
@@ -165,7 +165,7 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
165 * Responsible for handling management control frames 165 * Responsible for handling management control frames
166 * 166 *
167 * Called by ieee80211_rx */ 167 * Called by ieee80211_rx */
168static inline int 168static int
169ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb, 169ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb,
170 struct ieee80211_rx_stats *rx_stats, u16 type, 170 struct ieee80211_rx_stats *rx_stats, u16 type,
171 u16 stype) 171 u16 stype)
@@ -266,7 +266,7 @@ static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee,
266} 266}
267 267
268/* Called only as a tasklet (software IRQ), by ieee80211_rx */ 268/* Called only as a tasklet (software IRQ), by ieee80211_rx */
269static inline int 269static int
270ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb, 270ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
271 struct ieee80211_crypt_data *crypt) 271 struct ieee80211_crypt_data *crypt)
272{ 272{
@@ -297,7 +297,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
297} 297}
298 298
299/* Called only as a tasklet (software IRQ), by ieee80211_rx */ 299/* Called only as a tasklet (software IRQ), by ieee80211_rx */
300static inline int 300static int
301ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, 301ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee,
302 struct sk_buff *skb, int keyidx, 302 struct sk_buff *skb, int keyidx,
303 struct ieee80211_crypt_data *crypt) 303 struct ieee80211_crypt_data *crypt)
@@ -1156,7 +1156,7 @@ static int ieee80211_handle_assoc_resp(struct ieee80211_device *ieee, struct iee
1156 1156
1157/***************************************************/ 1157/***************************************************/
1158 1158
1159static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee80211_probe_response 1159static int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee80211_probe_response
1160 *beacon, 1160 *beacon,
1161 struct ieee80211_network *network, 1161 struct ieee80211_network *network,
1162 struct ieee80211_rx_stats *stats) 1162 struct ieee80211_rx_stats *stats)
@@ -1235,7 +1235,7 @@ static inline int is_same_network(struct ieee80211_network *src,
1235 !memcmp(src->ssid, dst->ssid, src->ssid_len)); 1235 !memcmp(src->ssid, dst->ssid, src->ssid_len));
1236} 1236}
1237 1237
1238static inline void update_network(struct ieee80211_network *dst, 1238static void update_network(struct ieee80211_network *dst,
1239 struct ieee80211_network *src) 1239 struct ieee80211_network *src)
1240{ 1240{
1241 int qos_active; 1241 int qos_active;
@@ -1294,7 +1294,7 @@ static inline int is_beacon(int fc)
1294 return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON); 1294 return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON);
1295} 1295}
1296 1296
1297static inline void ieee80211_process_probe_response(struct ieee80211_device 1297static void ieee80211_process_probe_response(struct ieee80211_device
1298 *ieee, struct 1298 *ieee, struct
1299 ieee80211_probe_response 1299 ieee80211_probe_response
1300 *beacon, struct ieee80211_rx_stats 1300 *beacon, struct ieee80211_rx_stats
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index e5b33c8d5db..8fdd943ebe8 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -127,7 +127,7 @@ payload of each frame is reduced to 492 bytes.
127static u8 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 }; 127static u8 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 };
128static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 }; 128static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };
129 129
130static inline int ieee80211_copy_snap(u8 * data, u16 h_proto) 130static int ieee80211_copy_snap(u8 * data, u16 h_proto)
131{ 131{
132 struct ieee80211_snap_hdr *snap; 132 struct ieee80211_snap_hdr *snap;
133 u8 *oui; 133 u8 *oui;
@@ -150,7 +150,7 @@ static inline int ieee80211_copy_snap(u8 * data, u16 h_proto)
150 return SNAP_SIZE + sizeof(u16); 150 return SNAP_SIZE + sizeof(u16);
151} 151}
152 152
153static inline int ieee80211_encrypt_fragment(struct ieee80211_device *ieee, 153static int ieee80211_encrypt_fragment(struct ieee80211_device *ieee,
154 struct sk_buff *frag, int hdr_len) 154 struct sk_buff *frag, int hdr_len)
155{ 155{
156 struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx]; 156 struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx];
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 406d5b96490..23e1630f50b 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -42,7 +42,7 @@ static const char *ieee80211_modes[] = {
42}; 42};
43 43
44#define MAX_CUSTOM_LEN 64 44#define MAX_CUSTOM_LEN 64
45static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee, 45static char *ipw2100_translate_scan(struct ieee80211_device *ieee,
46 char *start, char *stop, 46 char *start, char *stop,
47 struct ieee80211_network *network) 47 struct ieee80211_network *network)
48{ 48{
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 95fdf04f1d8..f6063e8f005 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -212,7 +212,7 @@ int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags)
212} 212}
213 213
214/* Process one complete nfnetlink message. */ 214/* Process one complete nfnetlink message. */
215static inline int nfnetlink_rcv_msg(struct sk_buff *skb, 215static int nfnetlink_rcv_msg(struct sk_buff *skb,
216 struct nlmsghdr *nlh, int *errp) 216 struct nlmsghdr *nlh, int *errp)
217{ 217{
218 struct nfnl_callback *nc; 218 struct nfnl_callback *nc;