diff options
| author | Antonio Quartulli | 2013-04-02 22:28:44 +0200 |
|---|---|---|
| committer | Antonio Quartulli | 2013-05-29 02:44:54 +0200 |
| commit | 41ab6c4891ed4cdd855ae569924acb1da424a614 (patch) | |
| tree | 073d8ba7befde0fb1965f0562f63dfb598d8210d /net/batman-adv/bat_iv_ogm.c | |
| parent | batman-adv: refactor batadv_tt_local_event() (diff) | |
| download | kernel-qcow2-linux-41ab6c4891ed4cdd855ae569924acb1da424a614.tar.gz kernel-qcow2-linux-41ab6c4891ed4cdd855ae569924acb1da424a614.tar.xz kernel-qcow2-linux-41ab6c4891ed4cdd855ae569924acb1da424a614.zip | |
batman-adv: don't deal with NET_IP_ALIGN manually
Instead of dealing with NET_IP_ALIGN during allocation and
headroom reservation, it is possible to use
netdev_alloc_skb_ip_align() which transparently allocate
and reserve the correct amount of data
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/bat_iv_ogm.c')
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 42b7a94d61b3..5b0a043c47c8 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -453,16 +453,16 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, else skb_size = packet_len; - skb_size += ETH_HLEN + NET_IP_ALIGN; + skb_size += ETH_HLEN; - forw_packet_aggr->skb = dev_alloc_skb(skb_size); + forw_packet_aggr->skb = netdev_alloc_skb_ip_align(NULL, skb_size); if (!forw_packet_aggr->skb) { if (!own_packet) atomic_inc(&bat_priv->batman_queue_left); kfree(forw_packet_aggr); goto out; } - skb_reserve(forw_packet_aggr->skb, ETH_HLEN + NET_IP_ALIGN); + skb_reserve(forw_packet_aggr->skb, ETH_HLEN); INIT_HLIST_NODE(&forw_packet_aggr->list); |