diff options
author | Auke Kok <auke-jan.h.kok@intel.com> | 2006-05-26 12:35:52 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-05-26 12:35:52 -0400 |
commit | 235949d162076832b8b9a6e30ca51876c3fa11e8 (patch) | |
tree | e9f666fa8e4cd6f41287295665a55e7b68d5536d | |
parent | 3352a3b20ce880b17f185ad55bf27751f1c8edb9 (diff) |
ixgb: remove inlines, allow compiler to choose
deinline a few large functions as to allow the compiler to pick.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index a714c4d2d84b..037b5c311758 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -203,7 +203,7 @@ module_exit(ixgb_exit_module); | |||
203 | * @adapter: board private structure | 203 | * @adapter: board private structure |
204 | **/ | 204 | **/ |
205 | 205 | ||
206 | static inline void | 206 | static void |
207 | ixgb_irq_disable(struct ixgb_adapter *adapter) | 207 | ixgb_irq_disable(struct ixgb_adapter *adapter) |
208 | { | 208 | { |
209 | atomic_inc(&adapter->irq_sem); | 209 | atomic_inc(&adapter->irq_sem); |
@@ -217,7 +217,7 @@ ixgb_irq_disable(struct ixgb_adapter *adapter) | |||
217 | * @adapter: board private structure | 217 | * @adapter: board private structure |
218 | **/ | 218 | **/ |
219 | 219 | ||
220 | static inline void | 220 | static void |
221 | ixgb_irq_enable(struct ixgb_adapter *adapter) | 221 | ixgb_irq_enable(struct ixgb_adapter *adapter) |
222 | { | 222 | { |
223 | if(atomic_dec_and_test(&adapter->irq_sem)) { | 223 | if(atomic_dec_and_test(&adapter->irq_sem)) { |
@@ -918,7 +918,7 @@ ixgb_free_tx_resources(struct ixgb_adapter *adapter) | |||
918 | adapter->tx_ring.desc = NULL; | 918 | adapter->tx_ring.desc = NULL; |
919 | } | 919 | } |
920 | 920 | ||
921 | static inline void | 921 | static void |
922 | ixgb_unmap_and_free_tx_resource(struct ixgb_adapter *adapter, | 922 | ixgb_unmap_and_free_tx_resource(struct ixgb_adapter *adapter, |
923 | struct ixgb_buffer *buffer_info) | 923 | struct ixgb_buffer *buffer_info) |
924 | { | 924 | { |
@@ -1179,7 +1179,7 @@ ixgb_watchdog(unsigned long data) | |||
1179 | #define IXGB_TX_FLAGS_VLAN 0x00000002 | 1179 | #define IXGB_TX_FLAGS_VLAN 0x00000002 |
1180 | #define IXGB_TX_FLAGS_TSO 0x00000004 | 1180 | #define IXGB_TX_FLAGS_TSO 0x00000004 |
1181 | 1181 | ||
1182 | static inline int | 1182 | static int |
1183 | ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb) | 1183 | ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb) |
1184 | { | 1184 | { |
1185 | #ifdef NETIF_F_TSO | 1185 | #ifdef NETIF_F_TSO |
@@ -1241,7 +1241,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb) | |||
1241 | return 0; | 1241 | return 0; |
1242 | } | 1242 | } |
1243 | 1243 | ||
1244 | static inline boolean_t | 1244 | static boolean_t |
1245 | ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb) | 1245 | ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb) |
1246 | { | 1246 | { |
1247 | struct ixgb_context_desc *context_desc; | 1247 | struct ixgb_context_desc *context_desc; |
@@ -1279,7 +1279,7 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb) | |||
1279 | #define IXGB_MAX_TXD_PWR 14 | 1279 | #define IXGB_MAX_TXD_PWR 14 |
1280 | #define IXGB_MAX_DATA_PER_TXD (1<<IXGB_MAX_TXD_PWR) | 1280 | #define IXGB_MAX_DATA_PER_TXD (1<<IXGB_MAX_TXD_PWR) |
1281 | 1281 | ||
1282 | static inline int | 1282 | static int |
1283 | ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, | 1283 | ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, |
1284 | unsigned int first) | 1284 | unsigned int first) |
1285 | { | 1285 | { |
@@ -1346,7 +1346,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, | |||
1346 | return count; | 1346 | return count; |
1347 | } | 1347 | } |
1348 | 1348 | ||
1349 | static inline void | 1349 | static void |
1350 | ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags) | 1350 | ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags) |
1351 | { | 1351 | { |
1352 | struct ixgb_desc_ring *tx_ring = &adapter->tx_ring; | 1352 | struct ixgb_desc_ring *tx_ring = &adapter->tx_ring; |
@@ -1849,7 +1849,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter) | |||
1849 | * @sk_buff: socket buffer with received data | 1849 | * @sk_buff: socket buffer with received data |
1850 | **/ | 1850 | **/ |
1851 | 1851 | ||
1852 | static inline void | 1852 | static void |
1853 | ixgb_rx_checksum(struct ixgb_adapter *adapter, | 1853 | ixgb_rx_checksum(struct ixgb_adapter *adapter, |
1854 | struct ixgb_rx_desc *rx_desc, | 1854 | struct ixgb_rx_desc *rx_desc, |
1855 | struct sk_buff *skb) | 1855 | struct sk_buff *skb) |