[ISDN] sc: Fix sndpkt to have the correct number of arguments (186fd777) · Commits · 戴 / test

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>

drivers/isdn/sc/card.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ void memcpy_fromshmem(int card, void dest, const void src, size_t n);
		int get_card_from_id(int driver);
		int indicate_status(int card, int event, ulong Channel, char *Data);
		irqreturn_t interrupt_handler(int interrupt, void *cardptr);
		int sndpkt(int devId, int channel, struct sk_buff *data);
		int sndpkt(int devId, int channel, int ack, struct sk_buff *data);
		void rcvpkt(int card, RspMessage *rcvmsg);
		int command(isdn_ctrl *cmd);
		int reset(int card);

drivers/isdn/sc/packet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		#include "message.h"
		#include "card.h"

		int sndpkt(int devId, int channel, struct sk_buff *data)
		int sndpkt(int devId, int channel, int ack, struct sk_buff *data)
		{
		LLData ReqLnkWrite;
		int status;

Admin message