Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[ISDN] sc: Fix sndpkt to have the correct number of arguments

isdn_if.writebuf_skb has an additional ack flag argument which
was missing from sndpkt leading to the following warning:
CC [M] drivers/isdn/sc/init.o
drivers/isdn/sc/init.c: In function ‘sc_init’:
drivers/isdn/sc/init.c:281: warning: assignment from incompatible pointer type

Note that this doesn't actually do anything with the flag, it
just fixes the warning (and probably accessing the last argument).

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Frank Lichtenheld and committed by
David S. Miller
186fd777 e1cd8f78

+2 -2
+1 -1
drivers/isdn/sc/card.h
··· 109 109 int get_card_from_id(int driver); 110 110 int indicate_status(int card, int event, ulong Channel, char *Data); 111 111 irqreturn_t interrupt_handler(int interrupt, void *cardptr); 112 - int sndpkt(int devId, int channel, struct sk_buff *data); 112 + int sndpkt(int devId, int channel, int ack, struct sk_buff *data); 113 113 void rcvpkt(int card, RspMessage *rcvmsg); 114 114 int command(isdn_ctrl *cmd); 115 115 int reset(int card);
+1 -1
drivers/isdn/sc/packet.c
··· 20 20 #include "message.h" 21 21 #include "card.h" 22 22 23 - int sndpkt(int devId, int channel, struct sk_buff *data) 23 + int sndpkt(int devId, int channel, int ack, struct sk_buff *data) 24 24 { 25 25 LLData ReqLnkWrite; 26 26 int status;