|
@@ -404,6 +404,7 @@ static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
|
|
|
ETH_HLEN-ETH_ALEN);
|
|
|
/* tell br_dev_xmit to continue with forwarding */
|
|
|
nf_bridge->mask |= BRNF_BRIDGED_DNAT;
|
|
|
+ /* FIXME Need to refragment */
|
|
|
ret = neigh->output(neigh, skb);
|
|
|
}
|
|
|
neigh_release(neigh);
|
|
@@ -459,6 +460,10 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
|
|
|
struct nf_bridge_info *nf_bridge = skb->nf_bridge;
|
|
|
struct rtable *rt;
|
|
|
int err;
|
|
|
+ int frag_max_size;
|
|
|
+
|
|
|
+ frag_max_size = IPCB(skb)->frag_max_size;
|
|
|
+ BR_INPUT_SKB_CB(skb)->frag_max_size = frag_max_size;
|
|
|
|
|
|
if (nf_bridge->mask & BRNF_PKT_TYPE) {
|
|
|
skb->pkt_type = PACKET_OTHERHOST;
|
|
@@ -863,13 +868,19 @@ static unsigned int br_nf_forward_arp(const struct nf_hook_ops *ops,
|
|
|
static int br_nf_dev_queue_xmit(struct sk_buff *skb)
|
|
|
{
|
|
|
int ret;
|
|
|
+ int frag_max_size;
|
|
|
|
|
|
+ /* This is wrong! We should preserve the original fragment
|
|
|
+ * boundaries by preserving frag_list rather than refragmenting.
|
|
|
+ */
|
|
|
if (skb->protocol == htons(ETH_P_IP) &&
|
|
|
skb->len + nf_bridge_mtu_reduction(skb) > skb->dev->mtu &&
|
|
|
!skb_is_gso(skb)) {
|
|
|
+ frag_max_size = BR_INPUT_SKB_CB(skb)->frag_max_size;
|
|
|
if (br_parse_ip_options(skb))
|
|
|
/* Drop invalid packet */
|
|
|
return NF_DROP;
|
|
|
+ IPCB(skb)->frag_max_size = frag_max_size;
|
|
|
ret = ip_fragment(skb, br_dev_queue_push_xmit);
|
|
|
} else
|
|
|
ret = br_dev_queue_push_xmit(skb);
|