[EBTABLES]: Adjust skb->pkt_type when necessary.

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index ab439476a33dbab71cbeb591b377ea134671c44a..8c41c41b7c172ede1037099d57b89c03136a23a7 100644 (file)
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -217,6 +217,7 @@ bridged_dnat:
                        }
                        memcpy(skb->mac.ethernet->h_dest, dev->dev_addr,
                               ETH_ALEN);
+                       skb->pkt_type = PACKET_HOST;
                }
        } else {
                skb->dst = (struct dst_entry *)&__fake_rtable;

diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c
index 998bab1c5ef9202f781c71cd042aa3673b3bffc0..befbfa1e06a7cce9b681263df0b724134be00ce0 100644 (file)
--- a/net/bridge/netfilter/ebt_redirect.c
+++ b/net/bridge/netfilter/ebt_redirect.c
@@ -34,11 +34,10 @@ static int ebt_target_redirect(struct sk_buff **pskb, unsigned int hooknr,
        if (hooknr != NF_BR_BROUTING)
                memcpy((**pskb).mac.ethernet->h_dest,
                   in->br_port->br->dev->dev_addr, ETH_ALEN);
-       else {
+       else
                memcpy((**pskb).mac.ethernet->h_dest,
                   in->dev_addr, ETH_ALEN);
-               (*pskb)->pkt_type = PACKET_HOST;
-       }
+       (*pskb)->pkt_type = PACKET_HOST;
        return info->target;
 }