git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
net
/
batman-adv
/
network-coding.c
diff --git
a/net/batman-adv/network-coding.c
b/net/batman-adv/network-coding.c
index a9546fe541ebb0ff8905fd3fe82d48e48302ce9e..8d04d174669ed29c467436d33b099ad5d0ca13c4 100644
(file)
--- a/
net/batman-adv/network-coding.c
+++ b/
net/batman-adv/network-coding.c
@@
-86,6
+86,7
@@
static void batadv_nc_tvlv_container_update(struct batadv_priv *bat_priv)
void batadv_nc_status_update(struct net_device *net_dev)
{
struct batadv_priv *bat_priv = netdev_priv(net_dev);
void batadv_nc_status_update(struct net_device *net_dev)
{
struct batadv_priv *bat_priv = netdev_priv(net_dev);
+
batadv_nc_tvlv_container_update(bat_priv);
}
batadv_nc_tvlv_container_update(bat_priv);
}
@@
-1343,7
+1344,7
@@
static void batadv_nc_skb_store_before_coding(struct batadv_priv *bat_priv,
struct ethhdr *ethhdr;
/* Copy skb header to change the mac header */
struct ethhdr *ethhdr;
/* Copy skb header to change the mac header */
- skb = pskb_copy(skb, GFP_ATOMIC);
+ skb = pskb_copy
_for_clone
(skb, GFP_ATOMIC);
if (!skb)
return;
if (!skb)
return;