From: David S. Miller Date: Fri, 20 Nov 2015 16:31:27 +0000 (-0500) Subject: Merge branch 'ppp-kill-zombie-state' X-Git-Tag: v4.5-rc1~128^2~272 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7521cd43ef04e0353ba499f528c91c34108a1169;p=karo-tx-linux.git Merge branch 'ppp-kill-zombie-state' Guillaume Nault says: ==================== ppp: Remove PPPOX_ZOMBIE socket state Several issues have been found lately wrt. the PPPOX_ZOMBIE socket state. This state is now only set upon reception of a PADT to stop further transmissions. However this is redundant with the PADT workqueue mechanism introduced by 287f3a943fef ("pppoe: Use workqueue to die properly when a PADT is received"). We can thus simplify pppox socket state handling by getting rid of PPPOX_ZOMBIE entirely. ==================== Signed-off-by: David S. Miller --- 7521cd43ef04e0353ba499f528c91c34108a1169