diff options
Diffstat (limited to 'drivers/s390/net/qeth.h')
-rw-r--r-- | drivers/s390/net/qeth.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h index 008e0a5d2eb3..3a0285669adf 100644 --- a/drivers/s390/net/qeth.h +++ b/drivers/s390/net/qeth.h | |||
@@ -824,7 +824,7 @@ extern struct list_head qeth_notify_list; | |||
824 | 824 | ||
825 | #define QETH_CARD_IFNAME(card) (((card)->dev)? (card)->dev->name : "") | 825 | #define QETH_CARD_IFNAME(card) (((card)->dev)? (card)->dev->name : "") |
826 | 826 | ||
827 | inline static __u8 | 827 | static inline __u8 |
828 | qeth_get_ipa_adp_type(enum qeth_link_types link_type) | 828 | qeth_get_ipa_adp_type(enum qeth_link_types link_type) |
829 | { | 829 | { |
830 | switch (link_type) { | 830 | switch (link_type) { |
@@ -835,7 +835,7 @@ qeth_get_ipa_adp_type(enum qeth_link_types link_type) | |||
835 | } | 835 | } |
836 | } | 836 | } |
837 | 837 | ||
838 | inline static int | 838 | static inline int |
839 | qeth_realloc_headroom(struct qeth_card *card, struct sk_buff **skb, int size) | 839 | qeth_realloc_headroom(struct qeth_card *card, struct sk_buff **skb, int size) |
840 | { | 840 | { |
841 | struct sk_buff *new_skb = NULL; | 841 | struct sk_buff *new_skb = NULL; |
@@ -852,6 +852,7 @@ qeth_realloc_headroom(struct qeth_card *card, struct sk_buff **skb, int size) | |||
852 | } | 852 | } |
853 | return 0; | 853 | return 0; |
854 | } | 854 | } |
855 | |||
855 | static inline struct sk_buff * | 856 | static inline struct sk_buff * |
856 | qeth_pskb_unshare(struct sk_buff *skb, int pri) | 857 | qeth_pskb_unshare(struct sk_buff *skb, int pri) |
857 | { | 858 | { |
@@ -863,8 +864,7 @@ qeth_pskb_unshare(struct sk_buff *skb, int pri) | |||
863 | return nskb; | 864 | return nskb; |
864 | } | 865 | } |
865 | 866 | ||
866 | 867 | static inline void * | |
867 | inline static void * | ||
868 | qeth_push_skb(struct qeth_card *card, struct sk_buff **skb, int size) | 868 | qeth_push_skb(struct qeth_card *card, struct sk_buff **skb, int size) |
869 | { | 869 | { |
870 | void *hdr; | 870 | void *hdr; |
@@ -887,7 +887,7 @@ qeth_push_skb(struct qeth_card *card, struct sk_buff **skb, int size) | |||
887 | } | 887 | } |
888 | 888 | ||
889 | 889 | ||
890 | inline static int | 890 | static inline int |
891 | qeth_get_hlen(__u8 link_type) | 891 | qeth_get_hlen(__u8 link_type) |
892 | { | 892 | { |
893 | #ifdef CONFIG_QETH_IPV6 | 893 | #ifdef CONFIG_QETH_IPV6 |
@@ -911,7 +911,7 @@ qeth_get_hlen(__u8 link_type) | |||
911 | #endif /* CONFIG_QETH_IPV6 */ | 911 | #endif /* CONFIG_QETH_IPV6 */ |
912 | } | 912 | } |
913 | 913 | ||
914 | inline static unsigned short | 914 | static inline unsigned short |
915 | qeth_get_netdev_flags(struct qeth_card *card) | 915 | qeth_get_netdev_flags(struct qeth_card *card) |
916 | { | 916 | { |
917 | if (card->options.layer2) | 917 | if (card->options.layer2) |
@@ -929,7 +929,7 @@ qeth_get_netdev_flags(struct qeth_card *card) | |||
929 | } | 929 | } |
930 | } | 930 | } |
931 | 931 | ||
932 | inline static int | 932 | static inline int |
933 | qeth_get_initial_mtu_for_card(struct qeth_card * card) | 933 | qeth_get_initial_mtu_for_card(struct qeth_card * card) |
934 | { | 934 | { |
935 | switch (card->info.type) { | 935 | switch (card->info.type) { |
@@ -950,7 +950,7 @@ qeth_get_initial_mtu_for_card(struct qeth_card * card) | |||
950 | } | 950 | } |
951 | } | 951 | } |
952 | 952 | ||
953 | inline static int | 953 | static inline int |
954 | qeth_get_max_mtu_for_card(int cardtype) | 954 | qeth_get_max_mtu_for_card(int cardtype) |
955 | { | 955 | { |
956 | switch (cardtype) { | 956 | switch (cardtype) { |
@@ -965,7 +965,7 @@ qeth_get_max_mtu_for_card(int cardtype) | |||
965 | } | 965 | } |
966 | } | 966 | } |
967 | 967 | ||
968 | inline static int | 968 | static inline int |
969 | qeth_get_mtu_out_of_mpc(int cardtype) | 969 | qeth_get_mtu_out_of_mpc(int cardtype) |
970 | { | 970 | { |
971 | switch (cardtype) { | 971 | switch (cardtype) { |
@@ -976,7 +976,7 @@ qeth_get_mtu_out_of_mpc(int cardtype) | |||
976 | } | 976 | } |
977 | } | 977 | } |
978 | 978 | ||
979 | inline static int | 979 | static inline int |
980 | qeth_get_mtu_outof_framesize(int framesize) | 980 | qeth_get_mtu_outof_framesize(int framesize) |
981 | { | 981 | { |
982 | switch (framesize) { | 982 | switch (framesize) { |
@@ -993,7 +993,7 @@ qeth_get_mtu_outof_framesize(int framesize) | |||
993 | } | 993 | } |
994 | } | 994 | } |
995 | 995 | ||
996 | inline static int | 996 | static inline int |
997 | qeth_mtu_is_valid(struct qeth_card * card, int mtu) | 997 | qeth_mtu_is_valid(struct qeth_card * card, int mtu) |
998 | { | 998 | { |
999 | switch (card->info.type) { | 999 | switch (card->info.type) { |
@@ -1008,7 +1008,7 @@ qeth_mtu_is_valid(struct qeth_card * card, int mtu) | |||
1008 | } | 1008 | } |
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | inline static int | 1011 | static inline int |
1012 | qeth_get_arphdr_type(int cardtype, int linktype) | 1012 | qeth_get_arphdr_type(int cardtype, int linktype) |
1013 | { | 1013 | { |
1014 | switch (cardtype) { | 1014 | switch (cardtype) { |
@@ -1027,7 +1027,7 @@ qeth_get_arphdr_type(int cardtype, int linktype) | |||
1027 | } | 1027 | } |
1028 | 1028 | ||
1029 | #ifdef CONFIG_QETH_PERF_STATS | 1029 | #ifdef CONFIG_QETH_PERF_STATS |
1030 | inline static int | 1030 | static inline int |
1031 | qeth_get_micros(void) | 1031 | qeth_get_micros(void) |
1032 | { | 1032 | { |
1033 | return (int) (get_clock() >> 12); | 1033 | return (int) (get_clock() >> 12); |