Skip to content

L
linux
Commit cef6ff22 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files
Options

s390/net: reduce inlining 

Clean up the inline cruft in s390 net drivers. Many of the inlined
functions had only one caller anyway.
Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8eb4930
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 74 deletions
drivers/s390/net/ctcm_main.c
View file @ cef6ff22
...@@ -305,7 +305,7 @@ static long ctcm_check_irb_error(struct ccw_device *cdev, struct irb *irb) ...@@ -305,7 +305,7 @@ static long ctcm_check_irb_error(struct ccw_device *cdev, struct irb *irb)
* ch The channel, the sense code belongs to. * ch The channel, the sense code belongs to.
* sense The sense code to inspect. * sense The sense code to inspect.
*/ */
static inline void ccw_unit_check(struct channel *ch, __u8 sense) static void ccw_unit_check(struct channel *ch, __u8 sense)
{ {
CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG, CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG,
"%s(%s): %02x", "%s(%s): %02x",
......
drivers/s390/net/lcs.c
View file @ cef6ff22
...@@ -327,8 +327,7 @@ lcs_set_allowed_threads(struct lcs_card *card, unsigned long threads) ...@@ -327,8 +327,7 @@ lcs_set_allowed_threads(struct lcs_card *card, unsigned long threads)
spin_unlock_irqrestore(&card->mask_lock, flags); spin_unlock_irqrestore(&card->mask_lock, flags);
wake_up(&card->wait_q); wake_up(&card->wait_q);
} }
static inline int static int lcs_threads_running(struct lcs_card *card, unsigned long threads)
lcs_threads_running(struct lcs_card *card, unsigned long threads)
{ {
unsigned long flags; unsigned long flags;
int rc = 0; int rc = 0;
...@@ -346,8 +345,7 @@ lcs_wait_for_threads(struct lcs_card *card, unsigned long threads) ...@@ -346,8 +345,7 @@ lcs_wait_for_threads(struct lcs_card *card, unsigned long threads)
lcs_threads_running(card, threads) == 0); lcs_threads_running(card, threads) == 0);
} }
static inline int static int lcs_set_thread_start_bit(struct lcs_card *card, unsigned long thread)
lcs_set_thread_start_bit(struct lcs_card *card, unsigned long thread)
{ {
unsigned long flags; unsigned long flags;
...@@ -373,8 +371,7 @@ lcs_clear_thread_running_bit(struct lcs_card *card, unsigned long thread) ...@@ -373,8 +371,7 @@ lcs_clear_thread_running_bit(struct lcs_card *card, unsigned long thread)
wake_up(&card->wait_q); wake_up(&card->wait_q);
} }
static inline int static int __lcs_do_run_thread(struct lcs_card *card, unsigned long thread)
__lcs_do_run_thread(struct lcs_card *card, unsigned long thread)
{ {
unsigned long flags; unsigned long flags;
int rc = 0; int rc = 0;
...@@ -444,8 +441,7 @@ lcs_setup_card(struct lcs_card *card) ...@@ -444,8 +441,7 @@ lcs_setup_card(struct lcs_card *card)
INIT_LIST_HEAD(&card->lancmd_waiters); INIT_LIST_HEAD(&card->lancmd_waiters);
} }
static inline void static void lcs_clear_multicast_list(struct lcs_card *card)
lcs_clear_multicast_list(struct lcs_card *card)
{ {
#ifdef CONFIG_IP_MULTICAST #ifdef CONFIG_IP_MULTICAST
struct lcs_ipm_list *ipm; struct lcs_ipm_list *ipm;
...@@ -656,8 +652,7 @@ __lcs_resume_channel(struct lcs_channel *channel) ...@@ -656,8 +652,7 @@ __lcs_resume_channel(struct lcs_channel *channel)
/** /**
* Make a buffer ready for processing. * Make a buffer ready for processing.
*/ */
static inline void static void __lcs_ready_buffer_bits(struct lcs_channel *channel, int index)
__lcs_ready_buffer_bits(struct lcs_channel *channel, int index)
{ {
int prev, next; int prev, next;
...@@ -1169,8 +1164,8 @@ lcs_get_mac_for_ipm(__be32 ipm, char *mac, struct net_device *dev) ...@@ -1169,8 +1164,8 @@ lcs_get_mac_for_ipm(__be32 ipm, char *mac, struct net_device *dev)
/** /**
* function called by net device to handle multicast address relevant things * function called by net device to handle multicast address relevant things
*/ */
static inline void static void lcs_remove_mc_addresses(struct lcs_card *card,
lcs_remove_mc_addresses(struct lcs_card *card, struct in_device *in4_dev) struct in_device *in4_dev)
{ {
struct ip_mc_list *im4; struct ip_mc_list *im4;
struct list_head *l; struct list_head *l;
...@@ -1196,8 +1191,9 @@ lcs_remove_mc_addresses(struct lcs_card *card, struct in_device *in4_dev) ...@@ -1196,8 +1191,9 @@ lcs_remove_mc_addresses(struct lcs_card *card, struct in_device *in4_dev)
spin_unlock_irqrestore(&card->ipm_lock, flags); spin_unlock_irqrestore(&card->ipm_lock, flags);
} }
static inline struct lcs_ipm_list * static struct lcs_ipm_list *lcs_check_addr_entry(struct lcs_card *card,
lcs_check_addr_entry(struct lcs_card *card, struct ip_mc_list *im4, char *buf) struct ip_mc_list *im4,
char *buf)
{ {
struct lcs_ipm_list *tmp, *ipm = NULL; struct lcs_ipm_list *tmp, *ipm = NULL;
struct list_head *l; struct list_head *l;
...@@ -1218,8 +1214,8 @@ lcs_check_addr_entry(struct lcs_card *card, struct ip_mc_list *im4, char *buf) ...@@ -1218,8 +1214,8 @@ lcs_check_addr_entry(struct lcs_card *card, struct ip_mc_list *im4, char *buf)
return ipm; return ipm;
} }
static inline void static void lcs_set_mc_addresses(struct lcs_card *card,
lcs_set_mc_addresses(struct lcs_card *card, struct in_device *in4_dev) struct in_device *in4_dev)
{ {
struct ip_mc_list *im4; struct ip_mc_list *im4;
......
drivers/s390/net/netiucv.c
View file @ cef6ff22
...@@ -249,14 +249,14 @@ struct ll_header { ...@@ -249,14 +249,14 @@ struct ll_header {
* Compatibility macros for busy handling * Compatibility macros for busy handling
* of network devices. * of network devices.
*/ */
static inline void netiucv_clear_busy(struct net_device *dev) static void netiucv_clear_busy(struct net_device *dev)
{ {
struct netiucv_priv *priv = netdev_priv(dev); struct netiucv_priv *priv = netdev_priv(dev);
clear_bit(0, &priv->tbusy); clear_bit(0, &priv->tbusy);
netif_wake_queue(dev); netif_wake_queue(dev);
} }
static inline int netiucv_test_and_set_busy(struct net_device *dev) static int netiucv_test_and_set_busy(struct net_device *dev)
{ {
struct netiucv_priv *priv = netdev_priv(dev); struct netiucv_priv *priv = netdev_priv(dev);
netif_stop_queue(dev); netif_stop_queue(dev);
......
drivers/s390/net/qeth_core_main.c
View file @ cef6ff22
...@@ -101,7 +101,7 @@ void qeth_close_dev(struct qeth_card *card) ...@@ -101,7 +101,7 @@ void qeth_close_dev(struct qeth_card *card)
} }
EXPORT_SYMBOL_GPL(qeth_close_dev); EXPORT_SYMBOL_GPL(qeth_close_dev);
static inline const char *qeth_get_cardname(struct qeth_card *card) static const char *qeth_get_cardname(struct qeth_card *card)
{ {
if (card->info.guestlan) { if (card->info.guestlan) {
switch (card->info.type) { switch (card->info.type) {
...@@ -330,7 +330,7 @@ static struct qeth_qdio_q *qeth_alloc_qdio_queue(void) ...@@ -330,7 +330,7 @@ static struct qeth_qdio_q *qeth_alloc_qdio_queue(void)
return q; return q;
} }
static inline int qeth_cq_init(struct qeth_card *card) static int qeth_cq_init(struct qeth_card *card)
{ {
int rc; int rc;
...@@ -352,7 +352,7 @@ static inline int qeth_cq_init(struct qeth_card *card) ...@@ -352,7 +352,7 @@ static inline int qeth_cq_init(struct qeth_card *card)
return rc; return rc;
} }
static inline int qeth_alloc_cq(struct qeth_card *card) static int qeth_alloc_cq(struct qeth_card *card)
{ {
int rc; int rc;
...@@ -397,7 +397,7 @@ static inline int qeth_alloc_cq(struct qeth_card *card) ...@@ -397,7 +397,7 @@ static inline int qeth_alloc_cq(struct qeth_card *card)
goto out; goto out;
} }
static inline void qeth_free_cq(struct qeth_card *card) static void qeth_free_cq(struct qeth_card *card)
{ {
if (card->qdio.c_q) { if (card->qdio.c_q) {
--card->qdio.no_in_queues; --card->qdio.no_in_queues;
...@@ -408,8 +408,9 @@ static inline void qeth_free_cq(struct qeth_card *card) ...@@ -408,8 +408,9 @@ static inline void qeth_free_cq(struct qeth_card *card)
card->qdio.out_bufstates = NULL; card->qdio.out_bufstates = NULL;
} }
static inline enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15, static enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15,
int delayed) { int delayed)
{
enum iucv_tx_notify n; enum iucv_tx_notify n;
switch (sbalf15) { switch (sbalf15) {
...@@ -432,8 +433,8 @@ static inline enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15, ...@@ -432,8 +433,8 @@ static inline enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15,
return n; return n;
} }
static inline void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q, static void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q, int bidx,
int bidx, int forced_cleanup) int forced_cleanup)
{ {
if (q->card->options.cq != QETH_CQ_ENABLED) if (q->card->options.cq != QETH_CQ_ENABLED)
return; return;
...@@ -475,8 +476,9 @@ static inline void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q, ...@@ -475,8 +476,9 @@ static inline void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q,
} }
static inline void qeth_qdio_handle_aob(struct qeth_card *card, static void qeth_qdio_handle_aob(struct qeth_card *card,
unsigned long phys_aob_addr) { unsigned long phys_aob_addr)
{
struct qaob *aob; struct qaob *aob;
struct qeth_qdio_out_buffer *buffer; struct qeth_qdio_out_buffer *buffer;
enum iucv_tx_notify notification; enum iucv_tx_notify notification;
...@@ -2228,7 +2230,7 @@ static int qeth_cm_setup(struct qeth_card *card) ...@@ -2228,7 +2230,7 @@ static int qeth_cm_setup(struct qeth_card *card)
} }
static inline int qeth_get_initial_mtu_for_card(struct qeth_card *card) static int qeth_get_initial_mtu_for_card(struct qeth_card *card)
{ {
switch (card->info.type) { switch (card->info.type) {
case QETH_CARD_TYPE_UNKNOWN: case QETH_CARD_TYPE_UNKNOWN:
...@@ -2251,7 +2253,7 @@ static inline int qeth_get_initial_mtu_for_card(struct qeth_card *card) ...@@ -2251,7 +2253,7 @@ static inline int qeth_get_initial_mtu_for_card(struct qeth_card *card)
} }
} }
static inline int qeth_get_mtu_outof_framesize(int framesize) static int qeth_get_mtu_outof_framesize(int framesize)
{ {
switch (framesize) { switch (framesize) {
case 0x4000: case 0x4000:
...@@ -2267,7 +2269,7 @@ static inline int qeth_get_mtu_outof_framesize(int framesize) ...@@ -2267,7 +2269,7 @@ static inline int qeth_get_mtu_outof_framesize(int framesize)
} }
} }
static inline int qeth_mtu_is_valid(struct qeth_card *card, int mtu) static int qeth_mtu_is_valid(struct qeth_card *card, int mtu)
{ {
switch (card->info.type) { switch (card->info.type) {
case QETH_CARD_TYPE_OSD: case QETH_CARD_TYPE_OSD:
...@@ -2738,8 +2740,8 @@ static void qeth_initialize_working_pool_list(struct qeth_card *card) ...@@ -2738,8 +2740,8 @@ static void qeth_initialize_working_pool_list(struct qeth_card *card)
} }
} }
static inline struct qeth_buffer_pool_entry *qeth_find_free_buffer_pool_entry( static struct qeth_buffer_pool_entry *qeth_find_free_buffer_pool_entry(
struct qeth_card *card) struct qeth_card *card)
{ {
struct list_head *plh; struct list_head *plh;
struct qeth_buffer_pool_entry *entry; struct qeth_buffer_pool_entry *entry;
...@@ -2870,7 +2872,7 @@ int qeth_init_qdio_queues(struct qeth_card *card) ...@@ -2870,7 +2872,7 @@ int qeth_init_qdio_queues(struct qeth_card *card)
} }
EXPORT_SYMBOL_GPL(qeth_init_qdio_queues); EXPORT_SYMBOL_GPL(qeth_init_qdio_queues);
static inline __u8 qeth_get_ipa_adp_type(enum qeth_link_types link_type) static __u8 qeth_get_ipa_adp_type(enum qeth_link_types link_type)
{ {
switch (link_type) { switch (link_type) {
case QETH_LINK_TYPE_HSTR: case QETH_LINK_TYPE_HSTR:
...@@ -3888,9 +3890,9 @@ int qeth_hdr_chk_and_bounce(struct sk_buff *skb, struct qeth_hdr **hdr, int len) ...@@ -3888,9 +3890,9 @@ int qeth_hdr_chk_and_bounce(struct sk_buff *skb, struct qeth_hdr **hdr, int len)
} }
EXPORT_SYMBOL_GPL(qeth_hdr_chk_and_bounce); EXPORT_SYMBOL_GPL(qeth_hdr_chk_and_bounce);
static inline void __qeth_fill_buffer(struct sk_buff *skb, static void __qeth_fill_buffer(struct sk_buff *skb,
struct qeth_qdio_out_buffer *buf, struct qeth_qdio_out_buffer *buf,
bool is_first_elem, unsigned int offset) bool is_first_elem, unsigned int offset)
{ {
struct qdio_buffer *buffer = buf->buffer; struct qdio_buffer *buffer = buf->buffer;
int element = buf->next_element_to_fill; int element = buf->next_element_to_fill;
...@@ -3951,10 +3953,10 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb, ...@@ -3951,10 +3953,10 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
buf->next_element_to_fill = element; buf->next_element_to_fill = element;
} }
static inline int qeth_fill_buffer(struct qeth_qdio_out_q *queue, static int qeth_fill_buffer(struct qeth_qdio_out_q *queue,
struct qeth_qdio_out_buffer *buf, struct qeth_qdio_out_buffer *buf,
struct sk_buff *skb, struct qeth_hdr *hdr, struct sk_buff *skb, struct qeth_hdr *hdr,
unsigned int offset, int hd_len) unsigned int offset, int hd_len)
{ {
struct qdio_buffer *buffer; struct qdio_buffer *buffer;
int flush_cnt = 0, hdr_len; int flush_cnt = 0, hdr_len;
...@@ -4821,7 +4823,7 @@ int qeth_vm_request_mac(struct qeth_card *card) ...@@ -4821,7 +4823,7 @@ int qeth_vm_request_mac(struct qeth_card *card)
} }
EXPORT_SYMBOL_GPL(qeth_vm_request_mac); EXPORT_SYMBOL_GPL(qeth_vm_request_mac);
static inline int qeth_get_qdio_q_format(struct qeth_card *card) static int qeth_get_qdio_q_format(struct qeth_card *card)
{ {
if (card->info.type == QETH_CARD_TYPE_IQD) if (card->info.type == QETH_CARD_TYPE_IQD)
return QDIO_IQDIO_QFMT; return QDIO_IQDIO_QFMT;
...@@ -4886,9 +4888,12 @@ static void qeth_determine_capabilities(struct qeth_card *card) ...@@ -4886,9 +4888,12 @@ static void qeth_determine_capabilities(struct qeth_card *card)
return; return;
} }
static inline void qeth_qdio_establish_cq(struct qeth_card *card, static void qeth_qdio_establish_cq(struct qeth_card *card,
struct qdio_buffer **in_sbal_ptrs, struct qdio_buffer **in_sbal_ptrs,
void (**queue_start_poll) (struct ccw_device *, int, unsigned long)) { void (**queue_start_poll)
(struct ccw_device *, int,
unsigned long))
{
int i; int i;
if (card->options.cq == QETH_CQ_ENABLED) { if (card->options.cq == QETH_CQ_ENABLED) {
...@@ -5180,9 +5185,10 @@ int qeth_core_hardsetup_card(struct qeth_card *card) ...@@ -5180,9 +5185,10 @@ int qeth_core_hardsetup_card(struct qeth_card *card)
} }
EXPORT_SYMBOL_GPL(qeth_core_hardsetup_card); EXPORT_SYMBOL_GPL(qeth_core_hardsetup_card);
static inline int qeth_create_skb_frag(struct qeth_qdio_buffer *qethbuffer, static int qeth_create_skb_frag(struct qeth_qdio_buffer *qethbuffer,
struct qdio_buffer_element *element, struct qdio_buffer_element *element,
struct sk_buff **pskb, int offset, int *pfrag, int data_len) struct sk_buff **pskb, int offset, int *pfrag,
int data_len)
{ {
struct page *page = virt_to_page(element->addr); struct page *page = virt_to_page(element->addr);
if (*pskb == NULL) { if (*pskb == NULL) {
......
drivers/s390/net/qeth_core_sys.c
View file @ cef6ff22
...@@ -78,7 +78,7 @@ static ssize_t qeth_dev_card_type_show(struct device *dev, ...@@ -78,7 +78,7 @@ static ssize_t qeth_dev_card_type_show(struct device *dev,
static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL); static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL);
static inline const char *qeth_get_bufsize_str(struct qeth_card *card) static const char *qeth_get_bufsize_str(struct qeth_card *card)
{ {
if (card->qdio.in_buf_size == 16384) if (card->qdio.in_buf_size == 16384)
return "16k"; return "16k";
......
drivers/s390/net/qeth_l2_main.c
View file @ cef6ff22
...@@ -231,13 +231,7 @@ static void qeth_l2_del_all_macs(struct qeth_card *card) ...@@ -231,13 +231,7 @@ static void qeth_l2_del_all_macs(struct qeth_card *card)
spin_unlock_bh(&card->mclock); spin_unlock_bh(&card->mclock);
} }
static inline u32 qeth_l2_mac_hash(const u8 *addr) static int qeth_l2_get_cast_type(struct qeth_card *card, struct sk_buff *skb)
{
return get_unaligned((u32 *)(&addr[2]));
}
static inline int qeth_l2_get_cast_type(struct qeth_card *card,
struct sk_buff *skb)
{ {
if (card->info.type == QETH_CARD_TYPE_OSN) if (card->info.type == QETH_CARD_TYPE_OSN)
return RTN_UNSPEC; return RTN_UNSPEC;
...@@ -248,8 +242,8 @@ static inline int qeth_l2_get_cast_type(struct qeth_card *card, ...@@ -248,8 +242,8 @@ static inline int qeth_l2_get_cast_type(struct qeth_card *card,
return RTN_UNSPEC; return RTN_UNSPEC;
} }
static inline void qeth_l2_hdr_csum(struct qeth_card *card, static void qeth_l2_hdr_csum(struct qeth_card *card, struct qeth_hdr *hdr,
struct qeth_hdr *hdr, struct sk_buff *skb) struct sk_buff *skb)
{ {
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
...@@ -606,13 +600,13 @@ static void qeth_promisc_to_bridge(struct qeth_card *card) ...@@ -606,13 +600,13 @@ static void qeth_promisc_to_bridge(struct qeth_card *card)
* only if there is not in the hash table storage already * only if there is not in the hash table storage already
* *
*/ */
static void static void qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha,
qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha, u8 is_uc) u8 is_uc)
{ {
u32 mac_hash = get_unaligned((u32 *)(&ha->addr[2]));
struct qeth_mac *mac; struct qeth_mac *mac;
hash_for_each_possible(card->mac_htable, mac, hnode, hash_for_each_possible(card->mac_htable, mac, hnode, mac_hash) {
qeth_l2_mac_hash(ha->addr)) {
if (is_uc == mac->is_uc && if (is_uc == mac->is_uc &&
!memcmp(ha->addr, mac->mac_addr, OSA_ADDR_LEN)) { !memcmp(ha->addr, mac->mac_addr, OSA_ADDR_LEN)) {
mac->disp_flag = QETH_DISP_ADDR_DO_NOTHING; mac->disp_flag = QETH_DISP_ADDR_DO_NOTHING;
...@@ -629,9 +623,7 @@ qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha, u8 is_uc) ...@@ -629,9 +623,7 @@ qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha, u8 is_uc)
mac->is_uc = is_uc; mac->is_uc = is_uc;
mac->disp_flag = QETH_DISP_ADDR_ADD; mac->disp_flag = QETH_DISP_ADDR_ADD;
hash_add(card->mac_htable, &mac->hnode, hash_add(card->mac_htable, &mac->hnode, mac_hash);
qeth_l2_mac_hash(mac->mac_addr));
} }
static void qeth_l2_set_rx_mode(struct net_device *dev) static void qeth_l2_set_rx_mode(struct net_device *dev)
......
drivers/s390/net/qeth_l3_main.c
View file @ cef6ff22
...@@ -867,7 +867,7 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *card, ...@@ -867,7 +867,7 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *card,
return rc; return rc;
} }
static inline u8 qeth_l3_get_qeth_hdr_flags4(int cast_type) static u8 qeth_l3_get_qeth_hdr_flags4(int cast_type)
{ {
if (cast_type == RTN_MULTICAST) if (cast_type == RTN_MULTICAST)
return QETH_CAST_MULTICAST; return QETH_CAST_MULTICAST;
...@@ -876,7 +876,7 @@ static inline u8 qeth_l3_get_qeth_hdr_flags4(int cast_type) ...@@ -876,7 +876,7 @@ static inline u8 qeth_l3_get_qeth_hdr_flags4(int cast_type)
return QETH_CAST_UNICAST; return QETH_CAST_UNICAST;
} }
static inline u8 qeth_l3_get_qeth_hdr_flags6(int cast_type) static u8 qeth_l3_get_qeth_hdr_flags6(int cast_type)
{ {
u8 ct = QETH_HDR_PASSTHRU | QETH_HDR_IPV6; u8 ct = QETH_HDR_PASSTHRU | QETH_HDR_IPV6;
if (cast_type == RTN_MULTICAST) if (cast_type == RTN_MULTICAST)
...@@ -1644,9 +1644,8 @@ static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev, ...@@ -1644,9 +1644,8 @@ static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev,
return 0; return 0;
} }
static inline int qeth_l3_rebuild_skb(struct qeth_card *card, static int qeth_l3_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,
struct sk_buff *skb, struct qeth_hdr *hdr, struct qeth_hdr *hdr, unsigned short *vlan_id)
unsigned short *vlan_id)
{ {
__u16 prot; __u16 prot;
struct iphdr *ip_hdr; struct iphdr *ip_hdr;
...@@ -2396,7 +2395,7 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -2396,7 +2395,7 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
return rc; return rc;
} }
inline int qeth_l3_get_cast_type(struct qeth_card *card, struct sk_buff *skb) static int qeth_l3_get_cast_type(struct qeth_card *card, struct sk_buff *skb)
{ {
int cast_type = RTN_UNSPEC; int cast_type = RTN_UNSPEC;
struct neighbour *n = NULL; struct neighbour *n = NULL;
...@@ -2534,8 +2533,8 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr, ...@@ -2534,8 +2533,8 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
rcu_read_unlock(); rcu_read_unlock();
} }
static inline void qeth_l3_hdr_csum(struct qeth_card *card, static void qeth_l3_hdr_csum(struct qeth_card *card, struct qeth_hdr *hdr,
struct qeth_hdr *hdr, struct sk_buff *skb) struct sk_buff *skb)
{ {
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7