projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
batman-adv: remove FSF address from GPL disclaimer
[deliverable/linux.git]
/
net
/
batman-adv
/
soft-interface.c
diff --git
a/net/batman-adv/soft-interface.c
b/net/batman-adv/soft-interface.c
index 36f050876f8260245a008de079cf0974fa97b76e..3686be7805f3be7db26e0c7e7d4ad00477984fc5 100644
(file)
--- a/
net/batman-adv/soft-interface.c
+++ b/
net/batman-adv/soft-interface.c
@@
-12,9
+12,7
@@
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "main.h"
*/
#include "main.h"
@@
-264,11
+262,11
@@
static int batadv_interface_tx(struct sk_buff *skb,
goto dropped;
bcast_packet = (struct batadv_bcast_packet *)skb->data;
goto dropped;
bcast_packet = (struct batadv_bcast_packet *)skb->data;
- bcast_packet->
header.
version = BATADV_COMPAT_VERSION;
- bcast_packet->
header.
ttl = BATADV_TTL;
+ bcast_packet->version = BATADV_COMPAT_VERSION;
+ bcast_packet->ttl = BATADV_TTL;
/* batman packet type: broadcast */
/* batman packet type: broadcast */
- bcast_packet->
header.
packet_type = BATADV_BCAST;
+ bcast_packet->packet_type = BATADV_BCAST;
bcast_packet->reserved = 0;
/* hw address of first interface is the orig mac because only
bcast_packet->reserved = 0;
/* hw address of first interface is the orig mac because only
@@
-328,7
+326,7
@@
void batadv_interface_rx(struct net_device *soft_iface,
struct sk_buff *skb, struct batadv_hard_iface *recv_if,
int hdr_size, struct batadv_orig_node *orig_node)
{
struct sk_buff *skb, struct batadv_hard_iface *recv_if,
int hdr_size, struct batadv_orig_node *orig_node)
{
- struct batadv_
header *batadv_header = (struct batadv_header *)skb->data
;
+ struct batadv_
bcast_packet *batadv_bcast_packet
;
struct batadv_priv *bat_priv = netdev_priv(soft_iface);
__be16 ethertype = htons(ETH_P_BATMAN);
struct vlan_ethhdr *vhdr;
struct batadv_priv *bat_priv = netdev_priv(soft_iface);
__be16 ethertype = htons(ETH_P_BATMAN);
struct vlan_ethhdr *vhdr;
@@
-336,7
+334,8
@@
void batadv_interface_rx(struct net_device *soft_iface,
unsigned short vid;
bool is_bcast;
unsigned short vid;
bool is_bcast;
- is_bcast = (batadv_header->packet_type == BATADV_BCAST);
+ batadv_bcast_packet = (struct batadv_bcast_packet *)skb->data;
+ is_bcast = (batadv_bcast_packet->packet_type == BATADV_BCAST);
/* check if enough space is available for pulling, and pull */
if (!pskb_may_pull(skb, hdr_size))
/* check if enough space is available for pulling, and pull */
if (!pskb_may_pull(skb, hdr_size))
@@
-345,7
+344,12
@@
void batadv_interface_rx(struct net_device *soft_iface,
skb_pull_rcsum(skb, hdr_size);
skb_reset_mac_header(skb);
skb_pull_rcsum(skb, hdr_size);
skb_reset_mac_header(skb);
- vid = batadv_get_vid(skb, hdr_size);
+ /* clean the netfilter state now that the batman-adv header has been
+ * removed
+ */
+ nf_reset(skb);
+
+ vid = batadv_get_vid(skb, 0);
ethhdr = eth_hdr(skb);
switch (ntohs(ethhdr->h_proto)) {
ethhdr = eth_hdr(skb);
switch (ntohs(ethhdr->h_proto)) {
This page took
0.024786 seconds
and
5
git commands to generate.