Skip to content

Commit 0461b76

Browse files
davem330davem330
committed
Merge branch 's390-next'
Julian Wiedmann says: ==================== s390/net: updates for 4.14 a mixed bag of minor fixes, cleanups and refactors for net-next. Please apply. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents d396179 + cb81619 commit 0461b76

File tree

9 files changed

+169
-207
lines changed

9 files changed

+169
-207
lines changed

‎drivers/s390/net/ctcm_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ static long ctcm_check_irb_error(struct ccw_device *cdev, struct irb *irb)
305305
* ch The channel, the sense code belongs to.
306306
* sense The sense code to inspect.
307307
*/
308-
static inline void ccw_unit_check(struct channel *ch, __u8 sense)
308+
static void ccw_unit_check(struct channel *ch, __u8 sense)
309309
{
310310
CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG,
311311
"%s(%s): %02x",

‎drivers/s390/net/lcs.c

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,7 @@ lcs_set_allowed_threads(struct lcs_card *card, unsigned long threads)
327327
spin_unlock_irqrestore(&card->mask_lock, flags);
328328
wake_up(&card->wait_q);
329329
}
330-
static inline int
331-
lcs_threads_running(struct lcs_card *card, unsigned long threads)
330+
static int lcs_threads_running(struct lcs_card *card, unsigned long threads)
332331
{
333332
unsigned long flags;
334333
int rc = 0;
@@ -346,8 +345,7 @@ lcs_wait_for_threads(struct lcs_card *card, unsigned long threads)
346345
lcs_threads_running(card, threads) == 0);
347346
}
348347

349-
static inline int
350-
lcs_set_thread_start_bit(struct lcs_card *card, unsigned long thread)
348+
static int lcs_set_thread_start_bit(struct lcs_card *card, unsigned long thread)
351349
{
352350
unsigned long flags;
353351

@@ -373,8 +371,7 @@ lcs_clear_thread_running_bit(struct lcs_card *card, unsigned long thread)
373371
wake_up(&card->wait_q);
374372
}
375373

376-
static inline int
377-
__lcs_do_run_thread(struct lcs_card *card, unsigned long thread)
374+
static int __lcs_do_run_thread(struct lcs_card *card, unsigned long thread)
378375
{
379376
unsigned long flags;
380377
int rc = 0;
@@ -444,8 +441,7 @@ lcs_setup_card(struct lcs_card *card)
444441
INIT_LIST_HEAD(&card->lancmd_waiters);
445442
}
446443

447-
static inline void
448-
lcs_clear_multicast_list(struct lcs_card *card)
444+
static void lcs_clear_multicast_list(struct lcs_card *card)
449445
{
450446
#ifdef CONFIG_IP_MULTICAST
451447
struct lcs_ipm_list *ipm;
@@ -656,8 +652,7 @@ __lcs_resume_channel(struct lcs_channel *channel)
656652
/**
657653
* Make a buffer ready for processing.
658654
*/
659-
static inline void
660-
__lcs_ready_buffer_bits(struct lcs_channel *channel, int index)
655+
static void __lcs_ready_buffer_bits(struct lcs_channel *channel, int index)
661656
{
662657
int prev, next;
663658

@@ -1169,8 +1164,8 @@ lcs_get_mac_for_ipm(__be32 ipm, char *mac, struct net_device *dev)
11691164
/**
11701165
* function called by net device to handle multicast address relevant things
11711166
*/
1172-
static inline void
1173-
lcs_remove_mc_addresses(struct lcs_card *card, struct in_device *in4_dev)
1167+
static void lcs_remove_mc_addresses(struct lcs_card *card,
1168+
struct in_device *in4_dev)
11741169
{
11751170
struct ip_mc_list *im4;
11761171
struct list_head *l;
@@ -1196,8 +1191,9 @@ lcs_remove_mc_addresses(struct lcs_card *card, struct in_device *in4_dev)
11961191
spin_unlock_irqrestore(&card->ipm_lock, flags);
11971192
}
11981193

1199-
static inline struct lcs_ipm_list *
1200-
lcs_check_addr_entry(struct lcs_card *card, struct ip_mc_list *im4, char *buf)
1194+
static struct lcs_ipm_list *lcs_check_addr_entry(struct lcs_card *card,
1195+
struct ip_mc_list *im4,
1196+
char *buf)
12011197
{
12021198
struct lcs_ipm_list *tmp, *ipm = NULL;
12031199
struct list_head *l;
@@ -1218,8 +1214,8 @@ lcs_check_addr_entry(struct lcs_card *card, struct ip_mc_list *im4, char *buf)
12181214
return ipm;
12191215
}
12201216

1221-
static inline void
1222-
lcs_set_mc_addresses(struct lcs_card *card, struct in_device *in4_dev)
1217+
static void lcs_set_mc_addresses(struct lcs_card *card,
1218+
struct in_device *in4_dev)
12231219
{
12241220

12251221
struct ip_mc_list *im4;

‎drivers/s390/net/netiucv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,14 @@ struct ll_header {
249249
* Compatibility macros for busy handling
250250
* of network devices.
251251
*/
252-
static inline void netiucv_clear_busy(struct net_device *dev)
252+
static void netiucv_clear_busy(struct net_device *dev)
253253
{
254254
struct netiucv_priv *priv = netdev_priv(dev);
255255
clear_bit(0, &priv->tbusy);
256256
netif_wake_queue(dev);
257257
}
258258

259-
static inline int netiucv_test_and_set_busy(struct net_device *dev)
259+
static int netiucv_test_and_set_busy(struct net_device *dev)
260260
{
261261
struct netiucv_priv *priv = netdev_priv(dev);
262262
netif_stop_queue(dev);

‎drivers/s390/net/qeth_core.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -857,11 +857,6 @@ static inline int qeth_get_ip_version(struct sk_buff *skb)
857857
}
858858
}
859859

860-
static inline int qeth_get_ip_protocol(struct sk_buff *skb)
861-
{
862-
return ip_hdr(skb)->protocol;
863-
}
864-
865860
static inline void qeth_put_buffer_pool_entry(struct qeth_card *card,
866861
struct qeth_buffer_pool_entry *entry)
867862
{
@@ -951,8 +946,10 @@ int qeth_get_priority_queue(struct qeth_card *, struct sk_buff *, int, int);
951946
int qeth_get_elements_no(struct qeth_card *card, struct sk_buff *skb,
952947
int extra_elems, int data_offset);
953948
int qeth_get_elements_for_frags(struct sk_buff *);
954-
int qeth_do_send_packet_fast(struct qeth_card *, struct qeth_qdio_out_q *,
955-
struct sk_buff *, struct qeth_hdr *, int, int);
949+
int qeth_do_send_packet_fast(struct qeth_card *card,
950+
struct qeth_qdio_out_q *queue, struct sk_buff *skb,
951+
struct qeth_hdr *hdr, unsigned int offset,
952+
int hd_len);
956953
int qeth_do_send_packet(struct qeth_card *, struct qeth_qdio_out_q *,
957954
struct sk_buff *, struct qeth_hdr *, int);
958955
int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);

0 commit comments

Comments
 (0)