The changes were originally made to fix conntrack unload problems with raw sockets. My original patch performed the nf_reset in the socket code, but Patrick suggested moving it to ip_output. The below patch reverts the ip_output changes, and implements the original suggested changes to raw socket handling. While this is unlikely to be the permanent solution, it will fix the current bridging problems while retaining the raw socket fixes. I'd suggest that this could be included in -stable while researching other solutions. Phil Signed-off-by: Phil Oester