build error in your git tree

[Yasuyuki KOZAKAI]

Hi, Harald,

I found that ip_conntrack in your git tree cannot be build because there are
two nfattr_to_tcp() in it. Their difference is only return value on error.
Sorry I didn't make patch because I don't know exactly what was occurred
in your tree. It seems that, this change, merging with upstream, and not
reverted change for return value, are related.

-----------------------------------------------------------------
Yasuyuki Kozakai @ USAGI Project <yasuyuki.kozakai at toshiba.co.jp>