6lowpan: Remove ununsed dev parameter from skb_delivery_cb callback.
Subsystems (5)
PATCH 1/1 6lowpan: Remove ununsed dev parameter from skb_delivery_cb callback.
This parameter is never used by any function implementing this callback.
--- include/net/6lowpan.h | 2 +- net/6lowpan/iphc.c | 2 +- net/bluetooth/6lowpan.c | 4 ++-- net/ieee802154/6lowpan_rtnl.c | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-)
include/net/6lowpan.h +1 -1
@@ -372,7 +372,7 @@ lowpan_uncompress_size(const struct sk_buff *skb, u16 *dgram_offset)return skb->len + uncomp_header - ret; } -typedef int (*skb_delivery_cb )(struct sk_buff *skb,struct net_device *dev); +typedef int (*skb_delivery_cb )(struct sk_buff *skb); int lowpan_process_data(struct sk_buff *skb, struct net_device *dev, const u8 *saddr, const u8 saddr_type, const u8 saddr_len,
net/6lowpan/iphc.c +1 -1
@@ -195,7 +195,7 @@ static int skb_deliver(struct sk_buff *skb, struct ipv6hdr *hdr,raw_dump_table (__func__,"raw skb data dump before receiving" , new->data, new->len); - stat =deliver_skb (new, dev); + stat =deliver_skb (new);kfree_skb (new);
net/bluetooth/6lowpan.c +2 -2
@@ -197,7 +197,7 @@ static struct lowpan_dev *lookup_dev(struct l2cap_conn *conn)return dev; } -static int give_skb_to_upper (struct sk_buff *skb,struct net_device *dev) +static int give_skb_to_upper (struct sk_buff *skb) {struct sk_buff *skb_cp;int ret;
@@ -283,7 +283,7 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,skb_reset_network_header (local_skb);skb_set_transport_header (local_skb,sizeof (struct ipv6hdr )); -if (give_skb_to_upper (local_skb, dev) !=NET_RX_SUCCESS ) { +if (give_skb_to_upper (local_skb) !=NET_RX_SUCCESS ) {kfree_skb (local_skb); goto drop; }
net/ieee802154/6lowpan_rtnl.c +2 -3
@@ -143,8 +143,7 @@ static int lowpan_header_create(struct sk_buff *skb, type, (void *)&da, (void *)&sa, 0); } -static int lowpan_give_skb_to_devices (struct sk_buff *skb, -struct net_device *dev) +static int lowpan_give_skb_to_devices (struct sk_buff *skb) {struct lowpan_dev_record *entry;struct sk_buff *skb_cp;
@@ -480,7 +479,7 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev,/* Pull off the 1-byte of 6lowpan header. */ skb_pull (skb,1 ); - ret =lowpan_give_skb_to_devices (skb,NULL ); + ret =lowpan_give_skb_to_devices (skb);if (ret ==NET_RX_DROP ) goto drop; }else {
Signature · 1 line
1.9.1
Alexander Aring
maintainerHi Martin,
Quoted 8 lines · Martin Townsend
This parameter is never used by any function implementing this callback.
--- include/net/6lowpan.h | 2 +- net/6lowpan/iphc.c | 2 +- net/bluetooth/6lowpan.c | 4 ++-- net/ieee802154/6lowpan_rtnl.c | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-)
I don't test it yet, but you need to add a Signed-off-by: ...
You can create this with -s parameter while git format-patch.
Then I will test it.
- Alex
Quoted 12 lines · Alexander Aring
Hi Martin,
Quoted 8 lines · Martin Townsend
This parameter is never used by any function implementing this callback.
--- include/net/6lowpan.h | 2 +- net/6lowpan/iphc.c | 2 +- net/bluetooth/6lowpan.c | 4 ++-- net/ieee802154/6lowpan_rtnl.c | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-)
Quoted 3 lines
I don't test it yet, but you need to add a Signed-off-by: ...
You can create this with -s parameter while git format-patch.
Usually the Sob is added during the commit with the -s parameter, i.e:
git commit -s
You can modify your commit and add the Sob with:
git commit --amend -s
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |