diff options
-rw-r--r-- | drivers/isdn/gigaset/asyncdata.c | 5 | ||||
-rw-r--r-- | drivers/isdn/gigaset/gigaset.h | 17 | ||||
-rw-r--r-- | drivers/isdn/gigaset/isocdata.c | 2 |
3 files changed, 3 insertions, 21 deletions
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c index 4f5dd9cf9e1b..2d2a6b6b83ff 100644 --- a/drivers/isdn/gigaset/asyncdata.c +++ b/drivers/isdn/gigaset/asyncdata.c | |||
@@ -252,8 +252,7 @@ byte_stuff: | |||
252 | inputstate |= INS_skip_frame; | 252 | inputstate |= INS_skip_frame; |
253 | break; | 253 | break; |
254 | } | 254 | } |
255 | *gigaset_skb_put_quick(skb, 1) = c; | 255 | *__skb_put(skb, 1) = c; |
256 | /* *__skb_put (skb, 1) = c; */ | ||
257 | fcs = crc_ccitt_byte(fcs, c); | 256 | fcs = crc_ccitt_byte(fcs, c); |
258 | } | 257 | } |
259 | 258 | ||
@@ -303,7 +302,7 @@ static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes, | |||
303 | inputstate |= INS_skip_frame; | 302 | inputstate |= INS_skip_frame; |
304 | break; | 303 | break; |
305 | } | 304 | } |
306 | *gigaset_skb_put_quick(skb, 1) = gigaset_invtab[c]; | 305 | *__skb_put(skb, 1) = gigaset_invtab[c]; |
307 | } | 306 | } |
308 | 307 | ||
309 | if (unlikely(!numbytes)) | 308 | if (unlikely(!numbytes)) |
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h index 12153acc23e4..3596096ca073 100644 --- a/drivers/isdn/gigaset/gigaset.h +++ b/drivers/isdn/gigaset/gigaset.h | |||
@@ -852,23 +852,6 @@ static inline void gigaset_bchannel_up(struct bc_state *bcs) | |||
852 | /* handling routines for sk_buff */ | 852 | /* handling routines for sk_buff */ |
853 | /* ============================= */ | 853 | /* ============================= */ |
854 | 854 | ||
855 | /* private version of __skb_put() | ||
856 | * append 'len' bytes to the content of 'skb', already knowing that the | ||
857 | * existing buffer can accomodate them | ||
858 | * returns a pointer to the location where the new bytes should be copied to | ||
859 | * This function does not take any locks so it must be called with the | ||
860 | * appropriate locks held only. | ||
861 | */ | ||
862 | static inline unsigned char *gigaset_skb_put_quick(struct sk_buff *skb, | ||
863 | unsigned int len) | ||
864 | { | ||
865 | unsigned char *tmp = skb->tail; | ||
866 | /*SKB_LINEAR_ASSERT(skb);*/ /* not needed here */ | ||
867 | skb->tail += len; | ||
868 | skb->len += len; | ||
869 | return tmp; | ||
870 | } | ||
871 | |||
872 | /* pass received skb to LL | 855 | /* pass received skb to LL |
873 | * Warning: skb must not be accessed anymore! | 856 | * Warning: skb must not be accessed anymore! |
874 | */ | 857 | */ |
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c index 5f2f47fdc045..2f1628734a38 100644 --- a/drivers/isdn/gigaset/isocdata.c +++ b/drivers/isdn/gigaset/isocdata.c | |||
@@ -532,7 +532,7 @@ static inline void hdlc_putbyte(unsigned char c, struct bc_state *bcs) | |||
532 | bcs->skb = NULL; | 532 | bcs->skb = NULL; |
533 | return; | 533 | return; |
534 | } | 534 | } |
535 | *gigaset_skb_put_quick(bcs->skb, 1) = c; | 535 | *__skb_put(bcs->skb, 1) = c; |
536 | } | 536 | } |
537 | 537 | ||
538 | /* hdlc_flush | 538 | /* hdlc_flush |